3 files changed, 31 insertions, 11 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index b3c0481968..2859b19b19 100644
--- a/indra/newview/llfloatersocial.cpp
+++ b/indra/newview/llfloatersocial.cpp
@@ -34,6 +34,7 @@
 #include "llfacebookconnect.h"
 #include "llfloaterreg.h"
 #include "lliconctrl.h"
+#include "llloadingindicator.h"
 #include "llslurl.h"
 #include "llviewerregion.h"
 #include "llviewercontrol.h"
@@ -463,8 +464,12 @@ void LLFloaterSocial::draw()
         mMapTexture->setBoostLevel(LLGLTexture::BOOST_MAP);
         mReloadingMapTexture = true;
         // In the meantime, put back the "loading" placeholder in the map widget
-        getChild<LLIconCtrl>("map_placeholder")->setImage(mMapPlaceholder);
-    }
+        getChild<LLLoadingIndicator>("map_loading_indicator")->setVisible(true);
+        getChild<LLIconCtrl>("map_placeholder")->setVisible(false);
+        mMapCheckBoxValue = getChild<LLCheckBoxCtrl>("add_place_view_cb")->get();
+        getChild<LLCheckBoxCtrl>("add_place_view_cb")->set(false);
+        getChild<LLCheckBoxCtrl>("add_place_view_cb")->setEnabled(false);
+   }
     // Are we done loading the map tile?
     if (mReloadingMapTexture && mMapTexture->isFullyLoaded())
     {
@@ -474,6 +479,11 @@ void LLFloaterSocial::draw()
         LLPointer<LLUIImage> ui_image = new LLUIImage(mMapUrl, mMapTexture);
         // Point map widget to correct map tile
         getChild<LLIconCtrl>("map_placeholder")->setImage(ui_image);
+        // Switch visibility
+        getChild<LLLoadingIndicator>("map_loading_indicator")->setVisible(false);
+        getChild<LLIconCtrl>("map_placeholder")->setVisible(true);
+        getChild<LLCheckBoxCtrl>("add_place_view_cb")->setEnabled(true);
+        getChild<LLCheckBoxCtrl>("add_place_view_cb")->set(mMapCheckBoxValue);
     }
     LLFloater::draw();
 }
diff --git a/indra/newview/llfloatersocial.h b/indra/newview/llfloatersocial.h
index 1e28e3cb7e..8b51d5ca9b 100644
--- a/indra/newview/llfloatersocial.h
+++ b/indra/newview/llfloatersocial.h
@@ -103,6 +103,7 @@ private:
     LLPointer<LLViewerFetchedTexture> mMapTexture;
 	LLPointer<LLUIImage> mMapPlaceholder;
     bool mReloadingMapTexture;
+    bool mMapCheckBoxValue;
 };
 
 #endif // LL_LLFLOATERSOCIAL_H
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 76c15b9624..960f883595 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -379,16 +379,25 @@
           <layout_panel
             name="place_map_panel"
             height="133">
-            <icon
+              <loading_indicator
               follows="left|top"
-              height="128"
-              width="128"
-              image_name="Map_Placeholder_Icon"
-              layout="topleft"
-              top="5"
-              left="9"
-              name="map_placeholder">
-            </icon>
+              height="24"
+              width="24"
+              name="map_loading_indicator"
+              top="57"
+              left="61"
+              visible="true"/>
+              <icon
+                follows="left|top"
+                height="128"
+                width="128"
+                image_name="Map_Placeholder_Icon"
+                layout="topleft"
+                top="5"
+                left="9"
+                visible="false"
+                name="map_placeholder">
+              </icon>
             <check_box
               follows="left|top"
               initial_value="true"