diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 000c63d22c..8beff26654 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5360,7 +5360,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>PerAccountSettingsFile</key>
     <map>
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index f9bd5ada15..7c42a581ff 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1550,7 +1550,9 @@ void LLFloaterTools::updateMediaSettings()
 	
 	
     // Auto scale
-    value_bool = default_media_data.getAutoScale();
+	// set default to auto scale TRUE -- angela  EXT-5172
+    //value_bool = default_media_data.getAutoScale();
+	value_bool = true;
     struct functor_getter_auto_scale : public LLSelectedTEGetFunctor< bool >
     {
 		functor_getter_auto_scale(const LLMediaEntry& entry): mMediaEntry(entry) {}	
@@ -1561,8 +1563,9 @@ void LLFloaterTools::updateMediaSettings()
                 if ( object->getTE(face) )
                     if ( object->getTE(face)->getMediaData() )
                         return object->getTE(face)->getMediaData()->getAutoScale();
-            return mMediaEntry.getAutoScale();;
-        };
+           // return mMediaEntry.getAutoScale();  set default to auto scale TRUE -- angela  EXT-5172
+			return true;
+		};
 		
 		const LLMediaEntry &mMediaEntry;
 		
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index e8ae006968..d888f8d566 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1568,7 +1568,7 @@ void LLPanelObjectInventory::reset()
 {
 	clearContents();
 
-	setBorderVisible(FALSE);
+	//setBorderVisible(FALSE);
 	
 	mCommitCallbackRegistrar.pushScope(); // push local callbacks
 	
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 23203d227e..d989282b9f 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2785,6 +2785,9 @@ even though the user gets a free copy.
              name="button permissions"
              width="130" />
             <panel_inventory_object
+             border="true"
+             border_visible="true"
+             bevel_style="in"
              follows="left|top"
              height="325"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 9796f7b5b6..194ae151d2 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -123,7 +123,7 @@
 	<button
      follows="top|left"
      height="20"
-     label="More"
+     label="Profile"
      layout="topleft"
      name="view_profile_btn"
      left_delta="96"