diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 35 | 
1 files changed, 34 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7e368b0c9c..eb045349c2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -375,6 +375,17 @@        <key>Value</key>        <integer>0</integer>      </map> +    <key>AutoPlayMedia</key> +    <map> +      <key>Comment</key> +      <string>Allow media objects to automatically play or navigate?</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>Boolean</string> +      <key>Value</key> +      <integer>1</integer> +    </map>      <key>AutoSnapshot</key>      <map>        <key>Comment</key> @@ -5316,6 +5327,17 @@        <key>Value</key>  	  <integer>13</integer>      </map> +    <key>PrimMediaMaxRetries</key> +    <map> +      <key>Comment</key> +      <string>Maximum number of retries for media queries.</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>U32</string> +      <key>Value</key> +      <integer>4</integer> +    </map>      <key>PrimMediaRequestQueueDelay</key>      <map>        <key>Comment</key> @@ -5404,6 +5426,17 @@        <key>Value</key>        <integer>0</integer>      </map> +    <key>QAModeEventHostPort</key> +    <map> +      <key>Comment</key> +      <string>Enable Testing Features.</string> +      <key>Persist</key> +      <integer>0</integer> +      <key>Type</key> +      <string>S32</string> +      <key>Value</key> +      <integer>-1</integer> +    </map>      <key>QuietSnapshotsToDisk</key>      <map>        <key>Comment</key> @@ -10014,7 +10047,7 @@        <key>Comment</key>        <string>Versioning Channel Name.</string>        <key>Persist</key> -      <integer>1</integer> +      <integer>0</integer>        <key>Type</key>        <string>String</string>        <key>Value</key>  | 
