diff options
| author | Jonathan Yap <none@none> | 2013-11-05 10:24:41 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-05 10:24:41 -0500 |
| commit | 2454bcc8db5952a16bd3a880825bf6a1b7086c3c (patch) | |
| tree | 443c276930926e43af4c8e9b6aebadefb0a3def6 | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
STORM-=1982 Remove duplicate entry in settings.xml
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 99527c0587..e715221826 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -674,6 +674,7 @@ Jonathan Yap OPEN-161 STORM-1953 STORM-1957 + STORM-1982 Kadah Coba STORM-1060 STORM-1843 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> |