diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 08:04:30 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 08:04:30 -0400 |
| commit | 17902bc735ea33db11abd21095f7e0edafb7abe7 (patch) | |
| tree | 0fd0b82f3bb4278f6565cc1256e361b7265aa3d7 /indra/newview/llfloaterworldmap.cpp | |
| parent | 8053bceaa0ccd6128536375c21cc3e9e19429efa (diff) | |
| parent | 1be08814e252654db98ce8c39dc8b4cf89c2e1dc (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-vs2017
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 1e9c9ce5e0..27197f0b06 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -122,7 +122,7 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { - if (!LLUI::sSettingGroups["config"]->getBOOL("EnableWorldMap")) + if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap")) { LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); return true; @@ -160,7 +160,7 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { - if (!LLUI::sSettingGroups["config"]->getBOOL("EnableWorldMap")) + if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap")) { LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); return true; |