diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 19:52:52 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 19:52:52 +0000 |
commit | 2a2016f1ef5ee35117f0de50bc5688d3736f5034 (patch) | |
tree | d3c5aac00b91275e169a0d434b3a08cd47d18621 /indra/newview/lllogininstance.cpp | |
parent | 93d0e15703ff91a856d362d9a5489c98b599d829 (diff) | |
parent | 4acc05b3793623a03ea763c5c8c4072f986ee286 (diff) |
merge.
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
-rw-r--r-- | indra/newview/lllogininstance.cpp | 3 |
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) |