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/llstartup.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/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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() | |||
| 1689 | LLFloaterActiveSpeakers::showInstance(); | 1689 | LLFloaterActiveSpeakers::showInstance(); |
| 1690 | } | 1690 | } |
| 1691 | 1691 | ||
| 1692 | if (gSavedSettings.getBOOL("BeaconAlwaysOn")) | 1692 | if (gSavedSettings.getBOOL("BeaconsEnabled")) |
| 1693 | { | 1693 | { |
| 1694 | LLFloaterBeacons::showInstance(); | 1694 | LLFloaterBeacons::showInstance(); |
| 1695 | } | 1695 | } |