diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
| commit | bfd8efb05753ac9ed858476797b5d407c912d926 (patch) | |
| tree | 52905cf59bcd5b67ddc186b26a23959201353a7a /indra/newview/lllogininstance.cpp | |
| parent | ed64630a67c2c216c369099532323cab2e251cab (diff) | |
| parent | b778ba9b882ecb03e61b3b9bd833618ca096f5da (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 029e700c4c..83a8134580 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -42,6 +42,7 @@ // newview #include "llviewernetwork.h" #include "llviewercontrol.h" +#include "llversioninfo.h" #include "llslurl.h" #include "llstartup.h" #include "llfloaterreg.h" @@ -149,6 +150,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia requested_options.append("newuser-config"); requested_options.append("ui-config"); #endif + requested_options.append("max-agent-groups"); requested_options.append("map-server-url"); requested_options.append("voice-config"); requested_options.append("tutorial_setting"); @@ -181,8 +183,8 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia request_params["read_critical"] = false; // handleTOSResponse request_params["last_exec_event"] = mLastExecEvent; request_params["mac"] = hashed_unique_id_string; - request_params["version"] = gCurrentVersion; // Includes channel name - request_params["channel"] = gSavedSettings.getString("VersionChannelName"); + request_params["version"] = LLVersionInfo::getVersionAndChannel(); // Includes channel name + request_params["channel"] = LLVersionInfo::getChannel(); request_params["id0"] = mSerialNumber; mRequestData.clear(); |