Merge branch 'master' into V2TextureSystem

Conflicts: indra/newview/llfloaterexport.cpp
2011-04-24 03:31:31 -05:00
parent 2d882e527f 50540049c1
commit 5954e0d71c
33 changed files with 1816 additions and 3725 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9,6 +9,22 @@
 		<string>settings_rlv.xml</string>
 	</array>

+    <key>FloaterObjectBackuptRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for the object backup floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>0</integer>
+        <integer>0</integer>
+        <integer>0</integer>
+      </array>
+    </map>

  <key>MediaEnableFilter</key>
  <map>