summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-22 10:51:16 -0400
committerOz Linden <oz@lindenlab.com>2013-03-22 10:51:16 -0400
commit61726237888b72de5bc49444adfeb931330fa929 (patch)
tree28abb6abb7f04e532a5085ccbdc346819c2fcd97 /indra/newview/llviewerdisplay.cpp
parented7785bf97a601448ba2da5fb2f19ea2861454c5 (diff)
parentef544a22218d59c6a121d4bf88c49868a2b9a713 (diff)
merge changes for 3.5.0-beta5
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r--indra/newview/llviewerdisplay.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index ffeea2f4df..40577118ba 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1038,7 +1038,6 @@ void render_hud_attachments()
if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices())
{
LLCamera hud_cam = *LLViewerCamera::getInstance();
- LLVector3 origin = hud_cam.getOrigin();
hud_cam.setOrigin(-1.f,0,0);
hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1));
LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE);