summaryrefslogtreecommitdiff
path: root/indra/newview/llglsandbox.cpp
AgeCommit message (Expand)Author
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
2010-03-08Merge with viewer 2 beta 4James Cook
2010-02-26Removed unnecessary include llhudtext.h from llviewerobject.hJames Cook
2010-02-25Support multiple fonts, colors and styles in name tagsJames Cook
2010-02-03Optimization pass.Dave Parks
2009-11-23Initial implementation of parcel property icons and maturity string on nav barJames Cook
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-01-02Print done when done.James Cook