diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
| commit | d3023153e9c7aa2eaf18468e8d81aebf0d6223e0 (patch) | |
| tree | f1265d15e702f1dd449476fd5e7b956ccd7f33f8 /indra/newview/llfloaterworldmap.cpp | |
| parent | 7766d424d0f8cf8a6c882f50bc4dd04bf8f2096b (diff) | |
| parent | cb47ae3264f3d9d22add17f2cbc5699c8620705f (diff) | |
merge changes for storm-1035
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 017cd2fc49..03cf0332a9 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -110,6 +110,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; + } + if (params.size() == 0) { // support the secondlife:///app/worldmap SLapp @@ -142,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) { |