summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
AgeCommit message (Expand)Author
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-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
2010-03-24EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
2010-02-24Allow for turning off of FBOsPalmer Truelson
2010-02-18viewer2 merge.Tofu Linden
2010-02-18EXT-5389 Unreadable resident names with glow.Tofu Linden
2010-02-18minor cleanup in prep for EXT-5389Tofu Linden
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-08Enable FBO multisampling for OSX.Dave Parks
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-20EXT-4198 Screen goes fuzzy after inactivityKarl Stiefvater (qarl)
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-14Backed out changeset f34a69c2af56Tofu Linden
2010-01-14Backed out changeset d5b761982e63Tofu Linden
2010-01-14Merge from viewer2, including fix for the test failure biting qarl.Tofu Linden
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ...angela
2010-01-11EXT-4066 - zooming while holding a hud in edit mode does not scale properlyrichard
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
2009-12-18Additional HTTP Texture tuniningSteve Bennetts
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-14DEV-42327: Compute controls position & size for HUD objectsRick Pasetto
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-10Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect...James Cook
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
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-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-22svn merge -r121194:121210Adam Moss
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-06svn merge -r109009:109164 svn+ssh://svn.lindenlab.com/svn/linden/branches/vie...Mark Palange
2009-02-03svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewe...Mark Palange
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-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-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-08-13QAR-782 Merge featurettes batch #2Steven 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-30Merging in file-move-merge ( QAR-649 )Eric Tulla
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 02:45:28 +0000