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

2010-07-14 Thread Johnnie Carling
On 07/14/10 9:43:13 am, Aleric Inglewood wrote: > After that it compiled and linked for me on linux, and probably also on > mac... another problem on Linux. (GCC 4.4.4 Debian sid) [ 54%] Building CXX object newview/CMakeFiles/INTEGRATION_TEST_llsecapi.dir/llsecapi.o Linki

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

2010-07-14 Thread Philippe (Merov) Bossut
On Wed, Jul 14, 2010 at 6:43 AM, Aleric Inglewood < aleric.inglew...@gmail.com> wrote: > I did a few commits: > > http://svn.secondlife.com/trac/linden/changeset/3486 > http://svn.secondlife.com/trac/linden/changeset/3487 > http://svn.secondlife.com/trac/linden/changeset/3488 > http://svn.secondli

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

2010-07-14 Thread Aleric Inglewood
I did a few commits: http://svn.secondlife.com/trac/linden/changeset/3486 http://svn.secondlife.com/trac/linden/changeset/3487 http://svn.secondlife.com/trac/linden/changeset/3488 http://svn.secondlife.com/trac/linden/changeset/3489 After that it compiled and linked for me on linux, and probably

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

2010-07-13 Thread 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

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

2010-07-09 Thread Philippe (Merov) Bossut
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 durin

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

2010-07-08 Thread Philippe (Merov) Bossut
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