diff options
author | Jacek Antonelli | 2009-05-30 19:12:56 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-05-30 19:12:56 -0500 |
commit | c58dec4a84c9da11e393e750a6a4fd73ebcc494a (patch) | |
tree | f1cb633bb19bc61097f0233c112e190c9c703f97 /linden/indra/newview/llfloaterbeacons.cpp | |
parent | Merged SL 1.22.11 into Imprudence 1.1 RC2. (diff) | |
download | meta-impy-c58dec4a84c9da11e393e750a6a4fd73ebcc494a.zip meta-impy-c58dec4a84c9da11e393e750a6a4fd73ebcc494a.tar.gz meta-impy-c58dec4a84c9da11e393e750a6a4fd73ebcc494a.tar.bz2 meta-impy-c58dec4a84c9da11e393e750a6a4fd73ebcc494a.tar.xz |
Use BeaconsEnabled instead of BeaconAlwaysOn in new 1.22 code.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterbeacons.cpp | 6 |
1 files changed, 3 insertions, 3 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() | |||
69 | } | 69 | } |
70 | 70 | ||
71 | // Needed to make the floater visibility toggle the beacons. | 71 | // Needed to make the floater visibility toggle the beacons. |
72 | // Too bad we can't just add control_name="BeaconAlwaysOn" to the XML. | 72 | // Too bad we can't just add control_name="BeaconsEnabled" to the XML. |
73 | void LLFloaterBeacons::open() | 73 | void LLFloaterBeacons::open() |
74 | { | 74 | { |
75 | LLFloater::open(); | 75 | LLFloater::open(); |
76 | gSavedSettings.setBOOL( "BeaconAlwaysOn", TRUE); | 76 | gSavedSettings.setBOOL( "BeaconsEnabled", TRUE); |
77 | } | 77 | } |
78 | void LLFloaterBeacons::close(bool app_quitting) | 78 | void LLFloaterBeacons::close(bool app_quitting) |
79 | { | 79 | { |
80 | LLFloater::close(app_quitting); | 80 | LLFloater::close(app_quitting); |
81 | if(!app_quitting) | 81 | if(!app_quitting) |
82 | { | 82 | { |
83 | gSavedSettings.setBOOL( "BeaconAlwaysOn", FALSE); | 83 | gSavedSettings.setBOOL( "BeaconsEnabled", FALSE); |
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||