summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-12 13:27:50 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-12 13:27:50 -0500
commite2a273f28eb59d2a704052b59b82c0c7b6ef4dc7 (patch)
tree25552d440ae550935b9b17ec70cf74ab3c0551cf /indra/newview/lllogininstance.cpp
parent4272ecaabe0db2545df8cd6a26afdb6b83492392 (diff)
parenta5f6da09757c371e08b4c184d18fd50388c0afe9 (diff)
update merge with viewer-2-0
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)