summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
AgeCommit message (Expand)Author
2010-04-07merge from viewer-trunkTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-01Automated MergeRoxie Linden
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-20mergeDave Parks
2010-03-17fixed EXT-6350 [HARD CODED] - System message when loosing connectivity needs ...Igor Borovkov
2010-02-13resolve.Tofu Linden
2010-02-13Backed out changeset d89b00b44ab6Tofu Linden
2010-02-13merge from viewer2. this fucks up davep's optimizations, so I'll backout the...Tofu Linden
2010-02-12Backed out davep's optimization pass. changeset 3c3685de430aPalmer Truelson
2010-02-09mergedavep@billy.gateway.2wire.net
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
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
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-11-20svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanu...Kyle Machulis
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-04-07Fix Mac compiler warning for deployment builds.James Cook
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:05:05 +0000