summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
AgeCommit message (Collapse)Author
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-24Allow for turning off of FBOsPalmer Truelson
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-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
Fix bad triangle in prim caps.
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-20EXT-4198 Screen goes fuzzy after inactivityKarl Stiefvater (qarl)
move disconnect rendering into render_ui code reviewed by davep
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-14Backed out changeset f34a69c2af56Tofu Linden
(this backs-out my backout, now that I'm happy the original merge works okay :))
2010-01-14Backed out changeset d5b761982e63Tofu Linden
This got pushed too early - sorry. Sigh.
2010-01-14Merge from viewer2, including fix for the test failure biting qarl.Tofu Linden
Minor conflict in llviewerfloaterreg.cpp resolved.
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
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2009-12-18Additional HTTP Texture tuniningSteve Bennetts
* Important fix in lltexturefetch.cpp where a 'partial' resonse was incorrectly setting mHaveAllData.
2009-12-18Merge with viewer-2-0Dave Parks
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!
2010-04-07merge from viewer-trunkTofu Linden
2010-04-05applied render-pipeline-7 @ 137608. This fixes empty depth buffer during ↵Palmer
highlight render
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-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 ↵Palmer
and more mesh inventory type info
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-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
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
2009-02-03svn merge -r107016:108767 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
merge featurettes-6-merge-2 -> release dataserver-is-deprecated
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-07-23svn merge -r92720:92721 ↵Karl Steifvater
svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL