diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
| commit | 7a74f64d5eda050da0d966b0fa3e76b4b54888fa (patch) | |
| tree | b3cee2fdcf01e11cf13dca58f56c3b1d0e804739 /indra/newview/lllogininstance.cpp | |
| parent | b48dad17260a7f5fbfc4d0548b4386d62efc2e5e (diff) | |
| parent | 9d3174c0386e6eefba1949075971ce7f75571394 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 029e700c4c..fe84aca147 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" @@ -181,8 +182,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(); |