Merge remote-tracking branch 'Aleric/master'

2013-01-08 13:11:43 -05:00
parent 8889f6b837 d8485350e7
commit 10c19731b3
13 changed files with 375 additions and 327 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14660,17 +14660,6 @@ This should be as low as possible, but too low may break functionality</string>
      <key>Value</key>
      <integer>0</integer>
    </map>
-    <key>UseFreezeTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Freeze time when taking snapshots.</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
    <key>UseInventoryLinks</key>
    <map>
      <key>Comment</key>