diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ef5719c02..b1842da0a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12181,6 +12181,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SnapshotBtnState</key>
+    <map>
+      <key>Comment</key>
+      <string/>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>SnapshotFormat</key>
     <map>
       <key>Comment</key>
@@ -15037,17 +15048,6 @@
         <integer>473</integer>
       </array>
     </map>
-    <key>RadarListBtnState</key>
-    <map>
-      <key>Comment</key>
-      <string/>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>WindEnabled</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index ac058cb2b..7fda1ffd2 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -229,7 +229,10 @@ void LLFloaterAvatarList::createInstance(bool visible)
 	sInstance = new LLFloaterAvatarList();
 	LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_radar.xml");
 	if(!visible)
+	{
 		sInstance->setVisible(FALSE);
+		gSavedSettings.setBOOL("ShowRadar", FALSE);
+	}
 }
 //static
 void LLFloaterAvatarList::toggle(void*)
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index e5c8a18a6..a60490da9 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -2110,11 +2110,17 @@ void LLFloaterSnapshot::draw()
 	}
 }
 
+void LLFloaterSnapshot::onOpen()
+{
+	gSavedSettings.setBOOL("SnapshotBtnState", TRUE);
+}
+
 void LLFloaterSnapshot::onClose(bool app_quitting)
 {
 	gSnapshotFloaterView->setEnabled(FALSE);
 	// Set invisible so it doesn't eat tooltips. JC
 	gSnapshotFloaterView->setVisible(FALSE);
+	gSavedSettings.setBOOL("SnapshotBtnState", FALSE);
 	destroy();
 }
 
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index 14f1872cd..8fb51c945 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -56,6 +56,7 @@ public:
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void draw();
 	/*virtual*/ void onClose(bool app_quitting);
+	/*virtual*/ void onOpen();
 
 	static void show(void*);
 	static void hide(void*);
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index 44fc368f3..8b1325ea2 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -134,7 +134,7 @@ BOOL LLToolBar::postBuild()
 	childSetControlName("appearance_btn", "");
 
 	childSetAction("radar_list_btn", onClickRadarList, this);
-	childSetControlName("radar_list_btn", "RadarListBtnState");
+	childSetControlName("radar_list_btn", "ShowRadar");
 
 	childSetAction("fly_btn", onClickFly, this);
 	childSetControlName("fly_btn", "FlyBtnState");
@@ -143,7 +143,7 @@ BOOL LLToolBar::postBuild()
 	childSetControlName("sit_btn", "SitBtnState");
 
 	childSetAction("snapshot_btn", onClickSnapshot, this);
-	childSetControlName("snapshot_btn", "");
+	childSetControlName("snapshot_btn", "SnapshotBtnState");
 
 	childSetAction("directory_btn", onClickDirectory, this);
 	childSetControlName("directory_btn", "ShowDirectory");
diff --git a/indra/newview/statemachine/aistatemachine.h b/indra/newview/statemachine/aistatemachine.h
index 094f30031..0c905668c 100644
--- a/indra/newview/statemachine/aistatemachine.h
+++ b/indra/newview/statemachine/aistatemachine.h
@@ -70,14 +70,16 @@
 //   .-------. |   |
 //   |  Run  |_,   |		Call multiplex_impl() until idle(), abort() or finish() is called.
 //   '-------'     |
-//    |     |      |
-//    v     |      |
-//  Abort   |      |		Calls abort_impl().
-//    |     |      |
-//    v     v      |
-//    Finish       |		Calls finish_impl().
-//       |         |
-//       `---------'
+//    |    |       |
+//    v    |       |
+//  Abort  |       |		Calls abort_impl().
+//    |    |       |
+//    v    v       |
+//    Finish       |		Calls finish_impl(), which may call kill() and/or the callback
+//    |    |       |		function passed to run(), if any, which may call kill() and/or run().
+//    |    `-------'
+//    v
+//  Killed					Delete the statemachine (all statemachines must be allocated with new).
 //
 // Each state causes corresponding code to be called.
 // Finish cleans up whatever is done by Initialize.
@@ -93,6 +95,12 @@
 // abort() in case of failure, or finish() in case of success.
 // Respectively these set the state to Abort and Finish.
 //
+// finish_impl may call kill() for a (default) destruction upon finish.
+// Even in that case the callback (passed to run()) may call run() again,
+// which overrides the request for a default kill. Or, if finish_impl
+// doesn't call kill() the callback may call kill() to request the
+// destruction of the state machine object.
+//
 // State machines are run from the "idle" part of the viewer main loop.
 // Often a state machine has nothing to do however. In that case it can
 // call the method idle(). This will stop the state machine until
@@ -184,7 +192,7 @@ class AIStateMachine {
 	base_state_type mState;						//!< State of the base class.
 	bool mIdle;									//!< True if this state machine is not running.
 	bool mAborted;								//!< True after calling abort() and before calling run().
-	bool mQueued;							//!< True when the statemachine is queued to be added back to the active list.
+	bool mQueued;								//!< True when the statemachine is queued to be added back to the active list.
 	S64 mSleep;									//!< Non-zero while the state machine is sleeping.
 
 	// Callback facilities.