summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-05 13:53:23 -0500
committerOz Linden <oz@lindenlab.com>2013-11-05 13:53:23 -0500
commit5ca4a4b8f34342ef510a4241bef4af7cd544d865 (patch)
tree0d877327394a65a3924ecfbe0b6d260025700cf9 /indra
parente3739edeff2e872ecee5f4dc29247f09db1ed87c (diff)
parent2454bcc8db5952a16bd3a880825bf6a1b7086c3c (diff)
merge changes for storm-1982
Diffstat (limited to 'indra')
-rwxr-xr-xindra/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 41aac583d7..50b0e54f5d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14860,17 +14860,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>DisablePrecacheDelayAfterTeleporting</key>
- <map>
- <key>Comment</key>
- <string>Disables the artificial delay in the viewer that precaches some incoming assets</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>FMODExProfilerEnable</key>
<map>
<key>Comment</key>