summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-02 21:29:36 -0800
committerRichard Linden <none@none>2011-03-02 21:29:36 -0800
commit0e87f37161a7b8c5df4f27b0f3a491c3b6546f66 (patch)
tree6b31dbf4402e5ff61e9bb93b2925a9cd4833242b /indra/newview/llfloaterworldmap.cpp
parent92403b4ea1c02d378a1157e8912f1e3976ba3772 (diff)
SOCIAL-623 FIX World map accessible from classified and picks in web profile in minimal skin
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
-rwxr-xr-xindra/newview/llfloaterworldmap.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 017cd2fc49..e6d91a658d 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