Merge

indra/newview/app_settings/settings.xml

@@ -2970,7 +2970,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-			<integer>0</integer>
+      <integer>0</integer>
     </map>
     <key>CameraPositionSmoothing</key>
     <map>
@@ -19966,6 +19966,17 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>FSDisplaySavedOutfitsCap</key>
+  <map>
+    <key>Comment</key>
+    <string>Display only so many saved outfits in edit appearance. 0 to disable.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>FSAdvancedWorldmapRegionInfo</key>
   <map>
     <key>Comment</key>

indra/newview/app_settings/settings_firestorm.xml

@@ -301,18 +301,6 @@
     <string>Boolean</string>
     <key>Value</key>
     <integer>1</integer>
-  </map> 
-
-  <key>FSDisplaySavedOutfitsCap</key>
-  <map>
-    <key>Comment</key>
-    <string>Display only so many saved outfits in edit appearance. 0 to disable.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>U32</string>
-    <key>Value</key>
-    <integer>0</integer>
   </map>
 	
   <key>FSShowChatType</key>