4 files changed, 18 insertions, 8 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index 937f76648d..66a586b16b 100644
--- a/indra/newview/llfloatersocial.cpp
+++ b/indra/newview/llfloatersocial.cpp
@@ -499,8 +499,8 @@ BOOL LLSocialCheckinPanel::postBuild()
 	mMessageTextEditor = getChild<LLUICtrl>("place_caption");
     mMapLoadingIndicator = getChild<LLUICtrl>("map_loading_indicator");
     mMapPlaceholder = getChild<LLIconCtrl>("map_placeholder");
+    mMapDefault = getChild<LLIconCtrl>("map_default");
     mMapCheckBox = getChild<LLCheckBoxCtrl>("add_place_view_cb");
-    mMapCheckBoxValue = mMapCheckBox->get();
     
 	return LLPanel::postBuild();
 }
@@ -511,6 +511,7 @@ void LLSocialCheckinPanel::draw()
     mPostButton->setEnabled(no_ongoing_connection);
     mCancelButton->setEnabled(no_ongoing_connection);
     mMessageTextEditor->setEnabled(no_ongoing_connection);
+    mMapCheckBox->setEnabled(no_ongoing_connection);
 
     std::string map_url = get_map_url();
     // Did we change location?
@@ -524,9 +525,6 @@ void LLSocialCheckinPanel::draw()
         // In the meantime, put the "loading" indicator on, hide the tile map and disable the checkbox
         mMapLoadingIndicator->setVisible(true);
         mMapPlaceholder->setVisible(false);
-        mMapCheckBoxValue = mMapCheckBox->get();
-        mMapCheckBox->set(false);
-        mMapCheckBox->setEnabled(false);
     }
     // Are we done loading the map tile?
     if (mReloadingMapTexture && mMapTexture->isFullyLoaded())
@@ -540,9 +538,10 @@ void LLSocialCheckinPanel::draw()
         // Now hide the loading indicator, bring the tile in view and reenable the checkbox with its previous value
         mMapLoadingIndicator->setVisible(false);
         mMapPlaceholder->setVisible(true);
-        mMapCheckBox->setEnabled(no_ongoing_connection);
-        mMapCheckBox->set(mMapCheckBoxValue);
     }
+    // Show the default icon if that's the checkbox value (the real one...)
+    // This will hide/show the loading indicator and/or tile underneath
+    mMapDefault->setVisible(!(mMapCheckBox->get()));
 
 	LLPanel::draw();
 }
diff --git a/indra/newview/llfloatersocial.h b/indra/newview/llfloatersocial.h
index e7ad9ac12e..bbe07c9704 100644
--- a/indra/newview/llfloatersocial.h
+++ b/indra/newview/llfloatersocial.h
@@ -110,9 +110,9 @@ private:
 	LLUICtrl* mMessageTextEditor;
     LLUICtrl* mMapLoadingIndicator;
     LLIconCtrl* mMapPlaceholder;
+    LLIconCtrl* mMapDefault;
     LLCheckBoxCtrl* mMapCheckBox;
     bool mReloadingMapTexture;
-    bool mMapCheckBoxValue;
 };
 
 class LLSocialAccountPanel : public LLPanel
diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.jpg b/indra/newview/skins/default/textures/icons/map_placeholder.jpg
index 0cb86c58d3..57204e2261 100644
--- a/indra/newview/skins/default/textures/icons/map_placeholder.jpg
+++ b/indra/newview/skins/default/textures/icons/map_placeholder.jpg
diff --git a/indra/newview/skins/default/xui/en/panel_social_place.xml b/indra/newview/skins/default/xui/en/panel_social_place.xml
index b53a41487a..13e94f6998 100644
--- a/indra/newview/skins/default/xui/en/panel_social_place.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_place.xml
@@ -71,9 +71,20 @@
                 visible="true"
                 name="map_placeholder">
               </icon>
+              <icon
+                  follows="left|top"
+                  height="128"
+                  width="128"
+                  image_name="Map_Placeholder_Icon"
+                  layout="topleft"
+                  top="20"
+                  left="9"
+                  visible="true"
+                  name="map_default">
+              </icon>
             <check_box
               follows="left|top"
-              initial_value="true"
+              initial_value="false"
               top_delta="8"
               width="8"
               label=""