diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-12 14:05:55 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-12 14:05:55 -0500 |
commit | dd9abe71c25f1ed03771005e8ca3f7fb0aaef5b2 (patch) | |
tree | a073c32f223597a59de3c6d76e652becd2516d92 /indra/newview/app_settings | |
parent | d53a354a9cc2589a7aa5d2d0cfc83ed0322c5e54 (diff) | |
parent | a5f6da09757c371e08b4c184d18fd50388c0afe9 (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 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> |