10e88f3891
Merge with RLVa-LL2.5.2
2011-04-09 22:24:22 -07:00
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
d0d3e716dc
Rolling back before back RLV merge
2010-11-04 10:02:01 -07:00
2c2cada190
merged VWR-23459 (fixed crash for certain command line options when compiled against Boost-1.42)
2010-10-16 21:15:06 +02:00
0f1d345e18
VWR-23459 FIXED Viewer compiled against Boost-1.42 crashes when certain command line options are given
...
used Aleric's SG2 changeset from http://svn.secondlife.com/trac/linden/changeset/3600
patching file doc/contributions.txt
Hunk #1 succeeded at 73 with fuzz 2.
patching file indra/newview/llcommandlineparser.cpp
Hunk #1 succeeded at 268 with fuzz 1 (offset -8 lines).
Edited doc/contributions.txt to create an entry for Aleric and moved the
issue ID there (patch wasn't able to place it at the right position,
lacking any context).
2010-10-16 18:24:52 +02:00
73b39c9b46
made destination guide url configurable on command line
2010-10-13 18:41:35 -07:00
5bb7cbc663
VWR-20749 (SNOW-624) FIXED Fix compiling the viewer with Boost 1.42
2010-08-18 13:01:56 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
afe61eb994
QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
2008-09-23 01:53:11 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
a3f3ab7e11
QAR-449 Viewer 1.20 RC 1
...
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
2008-04-17 02:56:14 +00:00
e3b97ac65b
merge release@82383 viewer-cleanup2-7-merge@82828
...
QAR-369
2008-03-20 21:41:26 +00:00
672a76d0ea
reverting premature commit at 82410.
2008-03-15 01:18:27 +00:00
04611efae8
[NOTE: This was an erroneous commit, and was reverted in the next revision]
...
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +00:00
Arrehn