summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
AgeCommit message (Collapse)Author
2010-10-21Automated merge up from viewer-developmentLoren Shih
2010-10-14for SH-335: create a debug tool to track of memory availability.Xiaohong Bao
2010-09-16MergeLeyla Farazha
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-26VWR-20715 Double-click teleportAimee Linden
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2 By Twisted Laws and Thickbrick Sleaford
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-17Merge (and resolve conflict) from q/viewer-releaseKent Quirk
2010-06-16trivial: remove some debug code of llpushcallstacks.Xiaohong Bao
2010-06-10EXT-7760: FIXED: only 10 avatars render non-impostoredXiaohong Bao
2010-05-19Merge pull from dessie/viewer-publicLeyla Farazha
2010-05-14merge from viewer-publicTofu Linden
2010-05-13EXT-7155: FIXED: bumpmaps failed to loadXiaohong Bao
reviewed by davep.
2010-05-12Fix for fullbright bump not working in deferred render.Dave Parks
Fix for shadow artifacts around split frusta. Tweak for shadow aliasing with projectors. Fix for crash on exit in mesh thread. (transplanted from 6dcf09cd3e524016c8130a0c8af3d9fc95f2d411)
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-01merge from viewer-trunkTofu Linden
2010-04-30trival: remove extra llpushcallstacks, which is for debug only.Xiaohong Bao
2010-04-26EXT-7060 default auto alpha masking to ON for deferred rendering (only ↵Tofu Linden
deferred rendering) (transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-24EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
#2 checkin. Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-08Merge with viewer 2 beta 4James Cook
2010-02-18Preference to set what fields name tags display, andJames Cook
first attempt at "use display names" menu item which doesn't work yet
2010-02-18EXT-5389 Unreadable resident names with glow.Tofu Linden
2010-02-18minor cleanup in prep for EXT-5389Tofu Linden
2010-01-20EXT-4198 Screen goes fuzzy after inactivityKarl Stiefvater (qarl)
move disconnect rendering into render_ui code reviewed by davep
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)
2010-01-11EXT-4066 - zooming while holding a hud in edit mode does not scale properlyrichard
EXT-4040 - Hud starts automoving when clicked reviewed by Mani
2009-12-18Additional HTTP Texture tuniningSteve Bennetts
* Important fix in lltexturefetch.cpp where a 'partial' resonse was incorrectly setting mHaveAllData.
2010-04-07merge from viewer-trunkTofu Linden
2010-04-05applied render-pipeline-7 @ 137608. This fixes empty depth buffer during ↵Palmer
highlight render
2010-03-26Applied (manually in places) diff from ↵Palmer
svn.lindenlab.com/svn/linden/branches/render-pipeline/render-pipeline-7@135361 to get deferred rendering changes from the svn branch. Bleh!
2009-12-14DEV-42327: Compute controls position & size for HUD objectsRick Pasetto
Review #62 Added facility to get the HUD projection and modelview matrices by refactoring the calls in llviewerdisplay a bit.
2009-11-10Sanitize naming of getWindowRect (scaled vs. raw pixels) and ↵James Cook
getWorldViewRect (scaled vs. raw) Reduces chance of future UI bugs related to UI size. Discussed with Richard.
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-07-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
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
ignore-dead-branch
2009-05-22svn merge -r121194:121210Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-06svn merge -r109009:109164 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22 Merge-back of non-voice related viewer 1.22 RC8 changes to trunk. QAR-1242