summaryrefslogtreecommitdiff
path: root/indra/newview/llscriptfloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-03 13:35:33 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-03 13:35:33 +0100
commitc89ff6e80be24f3c4c910b7f380ff587f5853455 (patch)
tree1945871fd38361534236096995d51fef9a5130ac /indra/newview/llscriptfloater.cpp
parent332cf3d32a8ddd56ac56ce36686bdfdedae0f8eb (diff)
parentdd6d7dde7e27130b72693c4bea0661c6b01efff2 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
-rw-r--r--indra/newview/llscriptfloater.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 75797dae81..f124659910 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -32,6 +32,7 @@
#include "llviewerprecompiledheaders.h"
#include "llscriptfloater.h"
+#include "llagentcamera.h"
#include "llbottomtray.h"
#include "llchannelmanager.h"
@@ -71,6 +72,7 @@ LLScriptFloater::LLScriptFloater(const LLSD& key)
{
setMouseDownCallback(boost::bind(&LLScriptFloater::onMouseDown, this));
setOverlapsScreenChannel(true);
+ mIsDockedStateForcedCallback = boost::bind(&LLAgentCamera::cameraMouselook, &gAgentCamera);
}
bool LLScriptFloater::toggle(const LLUUID& notification_id)