diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-03 13:35:33 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-03 13:35:33 +0100 |
commit | 6bff1b1444dca9c0230fd5996b9136cb2f76c8f1 (patch) | |
tree | 1945871fd38361534236096995d51fef9a5130ac /indra/newview/llscriptfloater.cpp | |
parent | 665274abad307e8c5fff38660e3cd7e9a912abe4 (diff) | |
parent | 48ccc7ccfbe3e94f9dd78ced588e0a76d03fe070 (diff) |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
-rw-r--r-- | indra/newview/llscriptfloater.cpp | 2 |
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) |