summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-12 14:05:55 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-12 14:05:55 -0500
commitdd9abe71c25f1ed03771005e8ca3f7fb0aaef5b2 (patch)
treea073c32f223597a59de3c6d76e652becd2516d92 /indra/newview/lllogininstance.cpp
parentd53a354a9cc2589a7aa5d2d0cfc83ed0322c5e54 (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)