diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
| commit | f64a20ddcff91677b02b7688e08819cffb0989c9 (patch) | |
| tree | 707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/llfloaterworldmap.cpp | |
| parent | c077250ff16aeaf0ec4c036154a427c677e85eb3 (diff) | |
| parent | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff) | |
merge changes for storm-1016
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) { |