diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-05 13:53:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-05 13:53:23 -0500 |
| commit | 5ca4a4b8f34342ef510a4241bef4af7cd544d865 (patch) | |
| tree | 0d877327394a65a3924ecfbe0b6d260025700cf9 | |
| parent | e3739edeff2e872ecee5f4dc29247f09db1ed87c (diff) | |
| parent | 2454bcc8db5952a16bd3a880825bf6a1b7086c3c (diff) | |
merge changes for storm-1982
| -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 6acd98529b..95133570c5 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -678,6 +678,7 @@ Jonathan Yap STORM-1953 STORM-1957 STORM-1975 + 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> |