summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-11-12 17:12:21 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-11-12 17:12:21 -0500
commita92c6ef67fbdef79e7163e1449616a15fd61b081 (patch)
treed328b0cc1ebe9aaf8c0705f0a1a49902bbe32e69 /indra/newview/lllogininstance.cpp
parent8863987cae0354db6d248633f33787bdf62293ca (diff)
parent4acc05b3793623a03ea763c5c8c4072f986ee286 (diff)
merging put on submenu fix with avatar-pipeline
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)