summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2017-07-26 17:12:43 +0000
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2017-07-26 17:12:43 +0000
commitfe57538d2f96f37cf7f7590e0d2bfd8b907f3e68 (patch)
tree847424ba546da34a6eba688614c6cfb2153e96cf /indra/newview/app_settings
parent822183057b13c8187d9dab68232b4274bc3ec3b2 (diff)
parent1a5fa01fb894d8e7da575d313fd5270fe4289ca7 (diff)
Merged MAINT-7495 Viewer retries too many times apon 504 from login.cgi
Approved-by: Simon Linden <simon@lindenlab.com> Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> Approved-by: Oz Linden <oz@lindenlab.com> Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0303581d62..4154c96378 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5592,12 +5592,12 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>10.0</real>
+ <real>40.0</real>
</map>
<key>LoginSRVPump</key>
<map>
<key>Comment</key>
- <string>Name of the message pump that handles SRV request</string>
+ <string>Name of the message pump that handles SRV request (deprecated)</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>