From 0e87f37161a7b8c5df4f27b0f3a491c3b6546f66 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 2 Mar 2011 21:29:36 -0800
Subject: SOCIAL-623 FIX World map accessible from classified and picks in web
 profile in minimal skin

---
 indra/newview/llfloaterworldmap.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/llfloaterworldmap.cpp')

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
-- 
cgit v1.2.3