diff options
| author | McCabe Maxsted | 2010-08-26 11:04:43 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-09-25 08:35:35 -0700 |
| commit | db9616811d45e168d81c8e464fb8a9cf27e51172 (patch) | |
| tree | a8539baeb46297d51072285d946f925a8544eb64 /linden/indra/newview/llstartup.cpp | |
| parent | Revert "Updated boost 1.36 libs for Windows to support local textures (todo: ... (diff) | |
| download | meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.zip meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.gz meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.bz2 meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.xz | |
Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 4 |
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() | |||
| 1938 | LLFloaterActiveSpeakers::showInstance(); | 1938 | LLFloaterActiveSpeakers::showInstance(); |
| 1939 | } | 1939 | } |
| 1940 | 1940 | ||
| 1941 | if (gSavedSettings.getBOOL("BeaconsEnabled")) | 1941 | static BOOL* sBeaconsEnabled = rebind_llcontrol<BOOL>("BeaconsEnabled", &gSavedSettings, true); |
| 1942 | |||
| 1943 | if (*sBeaconsEnabled) | ||
| 1942 | { | 1944 | { |
| 1943 | LLFloaterBeacons::showInstance(); | 1945 | LLFloaterBeacons::showInstance(); |
| 1944 | } | 1946 | } |