summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-05-26 19:36:15 -0700
committerRichard Nelson <none@none>2010-05-26 19:36:15 -0700
commitf33fdbf0ef25c485bdd09faaf1177d2b2b1a7694 (patch)
tree6ed52effeb29b1baff71cded878009744f618920 /indra/newview/llviewerwindow.cpp
parentd06281736e81707747636a8687e1a33ffda92b47 (diff)
moved SidebarCameraMovement logic out of special widget to camera setup code
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index e0463e3c4a..9773275ede 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3017,6 +3017,12 @@ void LLViewerWindow::updateWorldViewRect(bool use_full_window)
new_world_rect.mTop = llround((F32)new_world_rect.mTop * mDisplayScale.mV[VY]);
}
+ if (gSavedSettings.getBOOL("SidebarCameraMovement") == FALSE)
+ {
+ // use right edge of window, ignoring sidebar
+ new_world_rect.mRight = mWindowRectRaw.mRight;
+ }
+
if (mWorldViewRectRaw != new_world_rect)
{
mWorldViewRectRaw = new_world_rect;