summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
AgeCommit message (Expand)Author
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-25EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
2010-03-09Break name tag code out into LLHUDNameTagJames Cook
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-16Quick 'n dirty prioritization scheme for mesh loading.Dave Parks
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-10-16svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
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-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837...Mark Palange
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-23svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-pi...Karl Steifvater
2008-07-22svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> re...Josh Bell
2008-07-22merge uv-picking branch.Karl Steifvater
2008-06-27QAR-669 1.20 Viewer RC11Steven 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-19EFFECTIVE MERGES:Don Kjer
2008-05-09QAR-537 Viewer 1.20 RC 6Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven 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-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-01EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> releaseSteven Bennetts
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-09-14EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-07-18svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint...Bryan O'Sullivan