4 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llfloaterbeacons.cpp b/linden/indra/newview/llfloaterbeacons.cpp
index 2dee000..d636776 100644
--- a/linden/indra/newview/llfloaterbeacons.cpp
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -69,18 +69,18 @@ BOOL LLFloaterBeacons::postBuild()
 }
 
 // Needed to make the floater visibility toggle the beacons.
-// Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
+// Too bad we can't just add control_name="BeaconsEnabled" to the XML.
 void LLFloaterBeacons::open()
 {
         LLFloater::open();
-        gSavedSettings.setBOOL( "BeaconAlwaysOn", TRUE);
+        gSavedSettings.setBOOL( "BeaconsEnabled", TRUE);
 }
 void LLFloaterBeacons::close(bool app_quitting)
 {
         LLFloater::close(app_quitting);
         if(!app_quitting)
         {
-                gSavedSettings.setBOOL( "BeaconAlwaysOn", FALSE);
+                gSavedSettings.setBOOL( "BeaconsEnabled", FALSE);
         }
 }
 
diff --git a/linden/indra/newview/llfloaterbeacons.h b/linden/indra/newview/llfloaterbeacons.h
index 29aac17..15b1385 100644
--- a/linden/indra/newview/llfloaterbeacons.h
+++ b/linden/indra/newview/llfloaterbeacons.h
@@ -43,7 +43,7 @@ public:
         /*virtual*/ BOOL postBuild();
         
         // Needed to make the floater visibility toggle the beacons.
-        // Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
+        // Too bad we can't just add control_name="BeaconsEnabled" to the XML.
         /*virtual*/ void open();
         /*virtual*/ void close(bool app_quitting);
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index bb1982f..df7c084 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1689,7 +1689,7 @@ bool idle_startup()
                         LLFloaterActiveSpeakers::showInstance();
                 }
 
-                if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
+                if (gSavedSettings.getBOOL("BeaconsEnabled"))
                 {
                         LLFloaterBeacons::showInstance();
                 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
index 0fb1aaf..958e488 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
@@ -2,7 +2,7 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"

      width="250" height="225"

      name="beacons" title="Beacons"

-     rect_control="FloaterBeaconsRect" control_name="BeaconAlwaysOn">

+     rect_control="FloaterBeaconsRect" control_name="BeaconsEnabled">

         <panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">

         <check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />

     <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />