diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
| commit | cb1c85261e768c9653ed40bf6160e7cc7ca9ce74 (patch) | |
| tree | a5cccd2fca9fefe4717168f108bcb8d18fe98cf5 /indra/newview/llfloaterworldmap.cpp | |
| parent | c2e88db89a8ba111efd0c1b61cc8dec400a007cb (diff) | |
| parent | 6c0fbdafaed93b90354b37513a3b61dee56fb8b2 (diff) | |
Pull in viewer-development
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) { |