summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-03 14:49:33 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-03 14:49:33 -0500
commitf79615caced2cebb8e71b388b0dea45776b2f24b (patch)
tree44d7434cc5046976b03169bc74da71620c237a2b /indra/newview/lllogininstance.cpp
parent4e922949a9a1e508a698ce5a03657f1417252d9f (diff)
parent2491555272283340206f3532b9417ec07df40022 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
-rw-r--r--indra/newview/lllogininstance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 83a8134580..52ce932241 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -183,7 +183,7 @@ 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"] = LLVersionInfo::getVersionAndChannel(); // Includes channel name
+ request_params["version"] = LLVersionInfo::getChannelAndVersion(); // Includes channel name
request_params["channel"] = LLVersionInfo::getChannel();
request_params["id0"] = mSerialNumber;