From 3d3f72bd03707b7c71dcb9d37cbb2fec61d84be8 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Wed, 17 Feb 2010 15:51:17 +0800
Subject: EXT-5172  set prefs review: "Allow media to auto-play" , media
 setting "auto play" and "auto scale" to 'true' by default

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/llfloatertools.cpp        | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e962ea1815..73cca976be 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;
 		
-- 
cgit v1.2.3