diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 10:49:48 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 10:49:48 -0700 |
| commit | 65bf35cfed4b67d5f27628144f7519c81bd97dac (patch) | |
| tree | 8ca423d53d3105133e40e7bd7d3aaea3f0528023 /indra/newview/app_settings | |
| parent | 6c1706da69193de3ddbaf69a40e5ba0cad13283e (diff) | |
| parent | fce70328535ec04aba64972f47cface0b2fd3046 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2da0e29393..91d5e04665 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5305,6 +5305,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> @@ -5393,6 +5404,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> @@ -10003,7 +10025,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> |