diff options
| -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>  | 
