Merge branch 'main' into release/maint-c

# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/newview/llcontrolavatar.cpp

1 files changed, 0 insertions, 12 deletions

diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index da1e6cca74..bb4ae7e8ab 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -146,12 +146,6 @@ public:
                 const std::string& grid,
                 LLMediaCtrl* web)
     {
-        if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap"))
-        {
-            LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
-            return true;
-        }
-
         if (params.size() == 0)
         {
             // support the secondlife:///app/worldmap SLapp
@@ -207,12 +201,6 @@ public:
                 const std::string& grid,
                 LLMediaCtrl* web)
     {
-        if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap"))
-        {
-            LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
-            return true;
-        }
-
         //Make sure we have some parameters
         if (params.size() == 0)
         {