1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4fd4daa..39d9ab6 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1938,7 +1938,9 @@ bool idle_startup()
                         LLFloaterActiveSpeakers::showInstance();
                 }
 
-                if (gSavedSettings.getBOOL("BeaconsEnabled"))
+                static BOOL* sBeaconsEnabled = rebind_llcontrol<BOOL>("BeaconsEnabled", &gSavedSettings, true);
+
+                if (*sBeaconsEnabled)
                 {
                         LLFloaterBeacons::showInstance();
                 }