From 584962d5c79097904fec0102f78ea4aa7482a337 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 23 Oct 2009 15:21:49 +0000
Subject: svn merge -r137024:137071
 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph
 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
 Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845

---
 indra/newview/app_settings/foldertypes.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/foldertypes.xml b/indra/newview/app_settings/foldertypes.xml
index 698158308e..2038779c4f 100644
--- a/indra/newview/app_settings/foldertypes.xml
+++ b/indra/newview/app_settings/foldertypes.xml
@@ -65,10 +65,4 @@
     icon_name="inv_folder_outfit_undershirt.tga"
 	allowed="undershirt"
      />
-  <ensemble
-    asset_num="47"
-    xui_name="outfit"
-    icon_name="inv_folder_outfit.tga"
-	allowed="outfit"
-     />
 </ensemble_defs>
-- 
cgit v1.2.3


From 913786a62b2b8d8e6d9c483ea805a21e694fd818 Mon Sep 17 00:00:00 2001
From: skolb <none@none>
Date: Fri, 23 Oct 2009 15:29:00 -0700
Subject: DEV-41787 Media Auto Play controls were removed from prefs.  Also
 made auto play override prim settings.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fd0e05e7e2..eb045349c2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -375,6 +375,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>AutoPlayMedia</key>
+    <map>
+      <key>Comment</key>
+      <string>Allow media objects to automatically play or navigate?</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>AutoSnapshot</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3