summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-12 17:58:40 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-12 17:58:40 +0000
commite5a2b1c458a86006959b924986288c48689a9bd3 (patch)
tree1a9b8fc244234b76ef5f37c14133e5f716c1c53c /indra/newview/lllogininstance.cpp
parent74cb5c82a4e5eeb1ef722f73c96f64c4750db2be (diff)
parenta5f6da09757c371e08b4c184d18fd50388c0afe9 (diff)
merge.
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
-rw-r--r--indra/newview/lllogininstance.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 945294f3f2..a01426ea87 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -182,6 +182,9 @@ void LLLoginInstance::constructAuthParams(const LLSD& credentials)
mRequestData["method"] = "login_to_simulator";
mRequestData["params"] = request_params;
mRequestData["options"] = requested_options;
+
+ mRequestData["cfg_srv_timeout"] = gSavedSettings.getF32("LoginSRVTimeout");
+ mRequestData["cfg_srv_pump"] = gSavedSettings.getString("LoginSRVPump");
}
bool LLLoginInstance::handleLoginEvent(const LLSD& event)