diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-31 16:26:09 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-31 16:26:09 -0400 |
commit | 09179d1346ccf2fa07b2dec6a72592beb3bd262f (patch) | |
tree | 86b28bc6c0322a9abe9721dd0a0aa6e104487926 /indra/newview/llfloatercamera.cpp | |
parent | 0f9dc968cfb702eba595213bbecd34375bd048c5 (diff) | |
parent | f18cfe97750cc13374adab15636532fe0fbda19c (diff) |
merge viewer-development to mesh-development
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
-rw-r--r-- | indra/newview/llfloatercamera.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index aa78bc4f29..b33dea4890 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -347,13 +347,12 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val) mPrevMode(CAMERA_CTRL_MODE_PAN) { LLHints::registerHintTarget("view_popup", LLView::getHandle()); + mCommitCallbackRegistrar.add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraItem, _2)); } // virtual BOOL LLFloaterCamera::postBuild() { - setIsChrome(TRUE); - setTitleVisible(TRUE); // restore title visibility after chrome applying updateTransparency(TT_ACTIVE); // force using active floater transparency (STORM-730) mRotate = getChild<LLJoystickCameraRotate>(ORBIT); |