summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-03 11:55:08 -0800
committercallum <none@none>2010-12-03 11:55:08 -0800
commit6ec12a2cd9bc7ba6a8d8451fd8eb86ba43b2cd8c (patch)
treed8ef6121c4d018de65bc06f70f92cec4d402d3d9 /indra/newview/lllogininstance.cpp
parent1c946e8e4dcb6a6fcdfafeca82d9ba1db9f09e54 (diff)
parent2491555272283340206f3532b9417ec07df40022 (diff)
Merge after pull 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;