summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-11-13 16:30:39 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-11-13 16:30:39 +0200
commitbff45e735f55c474ecc6f485ef4b210ee0822b26 (patch)
tree96c3af96911f3baa6ab76e8ddf4c45756933662c /indra/newview/lllogininstance.cpp
parent8039b75ae8320a03a2a5339e5d0d1238de0335d2 (diff)
parent78a16b9334c9484d328f8800e801196eacf3900f (diff)
merge
--HG-- branch : product-engine
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)