diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-12 13:27:50 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-12 13:27:50 -0500 |
commit | e2a273f28eb59d2a704052b59b82c0c7b6ef4dc7 (patch) | |
tree | 25552d440ae550935b9b17ec70cf74ab3c0551cf /indra/newview/app_settings/settings.xml | |
parent | 4272ecaabe0db2545df8cd6a26afdb6b83492392 (diff) | |
parent | a5f6da09757c371e08b4c184d18fd50388c0afe9 (diff) |
update merge with viewer-2-0
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-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 15c9499bbc..0f82165b6e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4259,7 +4259,29 @@ <key>Value</key> <integer>0</integer> </map> - <key>LogMessages</key> + <key>LoginSRVTimeout</key> + <map> + <key>Comment</key> + <string>Duration in seconds of the login SRV request timeout</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>10.0</real> + </map> + <key>LoginSRVPump</key> + <map> + <key>Comment</key> + <string>Name of the message pump that handles SRV request</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>LLAres</string> + </map> + <key>LogMessages</key> <map> <key>Comment</key> <string>Log network traffic</string> |