diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-14 12:48:31 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-14 12:48:31 -0700 |
| commit | 9c2a19b833e071ca90e1e7840f6646200b07402a (patch) | |
| tree | 89ac88068784227c3b339aa41bb0372a28fc0d60 /indra/newview/llfloaterworldmap.cpp | |
| parent | 98bd63e0c8c73e300ae4af8071a9e2f167cfd6a6 (diff) | |
| parent | 96296eede9313d8a0636599e9b06dd501aba083c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index e6d91a658d..03cf0332a9 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -148,6 +148,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableWorldMap")) + { + LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { |