summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-20 07:14:54 -0400
committerOz Linden <oz@lindenlab.com>2011-08-20 07:14:54 -0400
commit86ae50784fe379312f1ec4afd73a70d73d4b7b94 (patch)
treedc29e6501afd103c2514f464a41bb0e4256da636 /indra/newview/app_settings
parent50ea915256d8c23c708a27154bb70e052c86ff51 (diff)
parent3c8f1dac14aa86025b5ab8eb53cbc302184015b5 (diff)
merge changes for storm-782
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 33541b559b..5c91e33963 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1629,17 +1629,6 @@
<string />
</array>
</map>
- <key>CompressSnapshotsToDisk</key>
- <map>
- <key>Comment</key>
- <string>Compress snapshots saved to disk (Using JPEG 2000)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>ConnectAsGod</key>
<map>
<key>Comment</key>