summaryrefslogtreecommitdiff
path: root/indra/newview/llworldview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:28:32 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:28:32 +0100
commite5273960de222ffae32405fde8e9fd566ff72d0a (patch)
treee4dbc9e0669f49f3e222ee9b3e8856700e300c98 /indra/newview/llworldview.cpp
parent63200e2a5bfc7538fd8114464000f35798670f23 (diff)
parent423398081b5c4402ebc162c43eaf29acdeb9f423 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llworldview.cpp')
-rw-r--r--indra/newview/llworldview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llworldview.cpp b/indra/newview/llworldview.cpp
index 7261e63147..b44a365677 100644
--- a/indra/newview/llworldview.cpp
+++ b/indra/newview/llworldview.cpp
@@ -44,6 +44,7 @@ static LLDefaultChildRegistry::Register<LLWorldView> r("world_view");
LLWorldView::LLWorldView(const Params& p)
: LLUICtrl (p)
{
+ gSavedSettings.getControl("SidebarCameraMovement")->getSignal()->connect(boost::bind(&LLWorldView::toggleSidebarCameraMovement, this, _2));
}
void LLWorldView::reshape(S32 width, S32 height, BOOL called_from_parent)
@@ -59,3 +60,8 @@ void LLWorldView::reshape(S32 width, S32 height, BOOL called_from_parent)
LLUICtrl::reshape(width, height, called_from_parent);
}
+void LLWorldView::toggleSidebarCameraMovement(const LLSD::Boolean& new_visibility)
+{
+ reshape(getParent()->getRect().getWidth(),getRect().getHeight());
+}
+