diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llviewerdisplay.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llviewerdisplay.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp index 59a87d5..22c17d9 100644 --- a/linden/indra/newview/llviewerdisplay.cpp +++ b/linden/indra/newview/llviewerdisplay.cpp | |||
| @@ -977,7 +977,6 @@ void render_hud_attachments() | |||
| 977 | if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices()) | 977 | if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices()) |
| 978 | { | 978 | { |
| 979 | LLCamera hud_cam = *LLViewerCamera::getInstance(); | 979 | LLCamera hud_cam = *LLViewerCamera::getInstance(); |
| 980 | LLVector3 origin = hud_cam.getOrigin(); | ||
| 981 | hud_cam.setOrigin(-1.f,0,0); | 980 | hud_cam.setOrigin(-1.f,0,0); |
| 982 | hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1)); | 981 | hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1)); |
| 983 | LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE); | 982 | LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE); |