summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
AgeCommit message (Expand)Author
2011-04-10merge changes for storm-954Oz Linden
2011-04-05merge changes for STORM-1051Oz Linden
2011-03-31Storm 954 - corrected use of bracesTwisted Laws twisted_laws@hotmail.com
2011-03-09STORM-954 patch correctionTwisted Laws twisted_laws@hotmail.com
2011-03-07fix for STORM-1046:[crashhunters] crash in LWorld::removeRegionXiaohong Bao
2011-02-19Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/Don Kjer
2011-02-18Cleanup of headless client (was: DisableRendering mode)Don Kjer
2011-02-15STORM-954 SL-viewer 2.0 No nearby people when over approxiamately 1000 metersTwisted Laws
2011-02-09debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWate...Xiaohong Bao
2010-11-05Merge latest from lindenlab/viewer-developmentDave SIMmONs
2010-10-27Automated merge from viewer-development-shiningLoren Shih
2010-10-12Initial work on viewer motion interpolation. Changes include:Dave SIMmONs
2010-09-30Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low a...Merov Linden
2010-09-13for VWR-22936: design test code/plan for the object cache.Xiaohong Bao
2010-09-01code for DEV-52939: viewer's object geometry cache files are not limited in n...Xiaohong Bao
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-05-27merge from viewer-publicTofu Linden
2010-05-26Fixes for DEV-50619 Have the low graphics settings be the lowest possible set...Jonathan Wolk
2010-05-12merge from viewer-publicTofu Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-01Automated MergeRoxie Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-17fixed EXT-6350 [HARD CODED] - System message when loosing connectivity needs ...Igor Borovkov
2010-02-03Optimization pass.Dave Parks
2009-12-18Timers to track time spent waiting on message system.Dave Parks
2009-12-09EXT-2896 Fixed poor handling of login error.Mark Palange (Mani)
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-09DEV-34822Roxanne Skelly
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-04-16svn merge -r117314:117337Adam Moss
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
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-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-06-07svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-17Undid previous commit (bogus merge)Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington