summaryrefslogtreecommitdiff
path: root/indra/newview/llcommandlineparser.cpp
AgeCommit message (Collapse)Author
2010-11-29SH-531 / CTS-324 FIX fix of VWR-20749 / SNOW-624 lost in mergeNyx (Neal Orman)
Re-applied fix originally committed in 1e93695ded30 Reveiewed code, appears straightforward.
2010-10-21Automated merge up from viewer-developmentLoren Shih
2010-10-16merged VWR-23459 (fixed crash for certain command line options when compiled ↵Boroondas Gupte
against Boost-1.42)
2010-10-16VWR-23459 FIXED Viewer compiled against Boost-1.42 crashes when certain ↵Boroondas Gupte (original fix by Aleric Inglewood)
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-13correct licenses (fix problem with license change merge)Oz Linden
2010-08-18VWR-20749 (SNOW-624) FIXED Fix compiling the viewer with Boost 1.42Aimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-04-17QAR-449 Viewer 1.20 RC 1Steven Bennetts
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
QAR-369
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
QAR-369 - viewer-cleanup2-7 81916 merged into release.