[opensource-dev] Viewer-external to Snowglobe 2.x trunk merge update

[Philippe (Merov) Bossut]

Hi,

Following the Hippo meeting this afternoon and one last test on Windows, I
did commit that merge to Snowglobe 2.x trunk: svn r 3484. This is a merge of
all viewer-external revisions from svn r3348 to r3472.

The Windows build went fine on TeamCity and we do have a Snowglobe 2.1
binary that can be tested:

http://secondlife.com/developers/opensource/downloads/2010///Snowglobe_2-1-0-0_Setup.exe

If you want to give it a spin, please do! I'm particularly interested in
Water Flickering tests as this is the merge code with the most conflicts.

Mac and Linux on the other hand fail. I'm working on Mac right now and will
get that fixed asap with the highest priority (it looks like I screwed up
some viewer_manifest.py stuff in the merge). If you are building on Mac or
Linux, I do appreciate your help to fix the build *but*, if you have no time
twiddling with build issues, please do not update your repo!

Cheers,
- Merov


On Fri, Jul 9, 2010 at 7:42 PM, Philippe (Merov) Bossut <merov at lindenlab.com
> wrote:

> Hi,
>
> I've been hit by Parabuild to TeamCity move issues today, with the
> Snowglobe build failing on TeamCity for script reasons. I just got a full
> 2.x trunk building on all platforms now on TeamCity but I think it's too
> late to do a big commit merge on a Friday night and have everything broken
> during the weekend... so I'm delaying that big commit merge to Monday
> morning. That way, I'll be there to keep an eye on builds and get help on
> TeamCity if needs be.
>
> Hope it's not derailing your plans.
>
> Cheers,
> - Merov
>
>
> On Thu, Jul 8, 2010 at 12:01 PM, Philippe (Merov) Bossut <
> merov at lindenlab.com> wrote:
>
>> Hi,
>>
>> As discussed at the last Hippo meeting, I've been working on this big
>> merge those last few days. After a couple of false starts, I decided to use
>> brute force and do a big range merge from svn r3348 to r3472. Surprise: it
>> worked! Well, modulo some changes (mostly in the Water Flickering fix but
>> also in TP double click and sit) but I do have a Snowglobe 2.1 version
>> working on Windows right now :)
>>
>> I'll be doing some more verifications today (that I didn't really gut some
>> Snowglobe features completely and don't have obvious crashers) and we'll
>> talk about it at the Hippo meeting later this afternoon. If everything goes
>> well though, I'm planning a *big* commit tomorrow morning.
>>
>> Let me know if you have issues with this plan.
>>
>> Cheers,
>> - Merov
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.secondlife.com/pipermail/opensource-dev/attachments/20100713/61d7f4d2/attachment.htm