From 591ad2bde7e0acca5eb38e7c29edf8f88d1488b4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 18 Oct 2011 12:20:36 -0700
Subject: EXP-1403 FIX View floater options do not function

---
 indra/newview/llfloatercamera.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llfloatercamera.cpp')

diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index aa78bc4f29..71077f5916 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -347,6 +347,7 @@ 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
-- 
cgit v1.2.3


From 30527b2206e7fce2890c3c44825ff0bef85aa5a0 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 18 Oct 2011 14:09:52 -0700
Subject: EXP-1409 FIX WASD controls don't move avatar while Move floater is in
 focus moved "chrome" flags to xui separated hiding floater title from setting
 chrome toolbar toggle button now moves floaters to frontmost and doesn't
 necessarily rely on focus

---
 indra/newview/llfloatercamera.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llfloatercamera.cpp')

diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 71077f5916..b33dea4890 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -353,8 +353,6 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 // 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);
-- 
cgit v1.2.3