From ade6bbb06c6a842f39a3fe32decf7c66682df092 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 17:16:27 +0000
Subject: merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3

---
 indra/newview/llfloatercamera.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 6ca8944a19..e79142513b 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -47,20 +47,24 @@ const F32 CAMERA_BUTTON_DELAY = 0.0f;
 //
 // Member functions
 //
-
-
 LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 :	LLFloater()
 {
-	setIsChrome(TRUE);
-	
 	// For now, only used for size and tooltip strings
 	const BOOL DONT_OPEN = FALSE;
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", DONT_OPEN);
-	
+}
+
+// virtual
+BOOL LLFloaterCamera::postBuild()
+{
+	setIsChrome(TRUE);
+
 	mRotate = getChild<LLJoystickCameraRotate>("cam_rotate_stick");
 	mZoom = getChild<LLJoystickCameraZoom>("zoom");
 	mTrack = getChild<LLJoystickCameraTrack>("cam_track_stick");
+
+	return TRUE;
 }
 
 // virtual
@@ -79,3 +83,4 @@ void LLFloaterCamera::onClose(bool app_quitting)
 		gSavedSettings.setBOOL("ShowCameraControls", FALSE);
 	}
 }
+
-- 
cgit v1.2.3