10 files changed, 4 insertions, 84 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bc2466d81b..efc19ad875 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6597,17 +6597,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowActiveSpeakers</key>
-    <map>
-      <key>Comment</key>
-      <string>Display active speakers list on login</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ShowAdvancedGraphicsSettings</key>
     <map>
       <key>Comment</key>
@@ -6652,17 +6641,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>ShowCameraControls</key>
-    <map>
-      <key>Comment</key>
-      <string>Display camera controls on login</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ShowConsoleWindow</key>
     <map>
       <key>Comment</key>
@@ -6985,17 +6963,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowMovementControls</key>
-    <map>
-      <key>Comment</key>
-      <string>Display movement controls on login</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ShowNearClip</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 1c99776c11..ee3e465832 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -67,20 +67,3 @@ BOOL LLFloaterCamera::postBuild()
 	return TRUE;
 }
 
-// virtual
-void LLFloaterCamera::onOpen(const LLSD& key)
-{
-	gSavedSettings.setBOOL("ShowCameraControls", TRUE);
-}
-
-// virtual
-void LLFloaterCamera::onClose(bool app_quitting)
-{
-	destroy();
-	
-	if (!app_quitting)
-	{
-		gSavedSettings.setBOOL("ShowCameraControls", FALSE);
-	}
-}
-
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index daea9ecee1..fabe8f577e 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -49,8 +49,6 @@ private:
 	LLFloaterCamera(const LLSD& val);
 	~LLFloaterCamera() {};
 	
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/ BOOL postBuild();
 public:
 	
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 1ba8bdc37f..963be61d93 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -69,16 +69,6 @@ LLFloaterMove::LLFloaterMove(const LLSD& key)
 }
 
 // virtual
-void LLFloaterMove::onClose(bool app_quitting)
-{
-	destroy();
-	
-	if (!app_quitting)
-	{
-		gSavedSettings.setBOOL("ShowMovementControls", FALSE);
-	}
-}
-// virtual
 BOOL LLFloaterMove::postBuild()
 {
 	setIsChrome(TRUE);
@@ -119,11 +109,6 @@ BOOL LLFloaterMove::postBuild()
 // Static member functions
 //
 
-void LLFloaterMove::onOpen(const LLSD& key)
-{
-	gSavedSettings.setBOOL("ShowMovementControls", TRUE);
-}
-
 // protected static 
 F32 LLFloaterMove::getYawRate( F32 time )
 {
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index de5d1ac432..250315b9f2 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -53,8 +53,6 @@ private:
 	~LLFloaterMove() {}
 public:
 
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/	BOOL	postBuild();
 	static F32	getYawRate(F32 time);
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 8b6124870d..f78703f58d 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1720,20 +1720,6 @@ bool idle_startup()
 		
 		LLFloaterReg::showInitialVisibleInstances();
 
-		if (gSavedSettings.getBOOL("ShowCameraControls"))
-		{
-			LLFloaterReg::showInstance("camera");
-		}
-		if (gSavedSettings.getBOOL("ShowMovementControls"))
-		{
-			LLFloaterReg::showInstance("moveview");
-		}
-
-		if (gSavedSettings.getBOOL("ShowActiveSpeakers"))
-		{
-			LLFloaterReg::showInstance("active_speakers");
-		}
-
 		if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
 		{
 			LLFloaterReg::showInstance("beacons");
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 6a00b9ae49..403b710459 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -177,4 +177,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("media_remote_ctrl", "floater_media_remote.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMediaRemoteCtrl>);
 
 	// *NOTE: Please keep these alphabetized for easier merges
+
+	LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving
 }
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 6f094e4b01..2caa8f2309 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1601,7 +1601,6 @@ void LLViewerWindow::initWorldUI()
 	
 	// Force gFloaterWorldMap to initialize
 	LLFloaterReg::getInstance("world_map");
-	LLFloaterReg::hideInstance("world_map");
 
 	// Force gFloaterTools to initialize
 	LLFloaterReg::getInstance("build");
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 7f24b11d14..343ff893e8 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -7,6 +7,7 @@
  layout="topleft"
  name="camera_floater"
  save_rect="true"
+ save_visibility="true"
  width="176">
     <floater.string
      name="rotate_tooltip">
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 47342ffc5b..7666a2494d 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -7,6 +7,7 @@
  layout="topleft"
  name="move_floater"
  save_rect="true"
+ save_visibility="true"
  width="135">
     <button
      follows="left|bottom"