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 @@ Value 0 - DisablePrecacheDelayAfterTeleporting - - Comment - Disables the artificial delay in the viewer that precaches some incoming assets - Persist - 0 - Type - Boolean - Value - 0 - FMODExProfilerEnable Comment