summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 15:32:12 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 15:32:12 -0500
commitb8a925ec71f2a4483476e363428c5656702b1f19 (patch)
tree117c4b884d8fd1e79e8f64184e62ea453d82a990 /indra/newview/lllogininstance.cpp
parent23031612745c7f1094a77252b24039333420b8c5 (diff)
parent90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (diff)
merge fix for STORM-584
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;