Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaks to fix the channel stuff, save a bit of processing.

Browse Source 
A few options I missed with the last commit, and some minor patching because it's in the same file.
This commit is contained in:
Beeks
2010-09-24 20:13:07 -04:00
parent f8c2308c87
commit 4bf3859c09
7 changed files with 42 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
indra/newview/lluserauth.cpp
View File

@@ -130,22 +130,8 @@ void LLUserAuth::authenticate(
XMLRPC_VectorAppendString(params, "last", lastname.c_str(), 0);
XMLRPC_VectorAppendString(params, "web_login_key", web_login_key.getString().c_str(), 0);
XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
// <edit>
//XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
//XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
//WOW NEIL YOU ARE SO AWESOME!!
XMLRPC_VectorAppendString(params, "version", std::string(
llformat("%s", LL_CHANNEL) + " " +
llformat("%d", LL_VERSION_MAJOR) + "." +
llformat("%d", LL_VERSION_MINOR) + "." +
llformat("%d", LL_VERSION_PATCH) + "." +
llformat("%d", LL_VERSION_BUILD)
).c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", std::string(LL_CHANNEL).c_str(), 0);
XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", LL_CHANNEL, 0);
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
@@ -232,18 +218,8 @@ void LLUserAuth::authenticate(
XMLRPC_VectorAppendString(params, "last", lastname.c_str(), 0);
XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0);
XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
//Partially correct but I'm very skeptical of the gSavedSettings part. Imprudence does it, but that doesn't mean it's right... -HgB
//XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
//XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
XMLRPC_VectorAppendString(params, "version", std::string(
llformat("%s", LL_CHANNEL) + " " +
llformat("%d", LL_VERSION_MAJOR) + "." +
llformat("%d", LL_VERSION_MINOR) + "." +
llformat("%d", LL_VERSION_PATCH) + "." +
llformat("%d", LL_VERSION_BUILD)
).c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", std::string(LL_CHANNEL).c_str(), 0);
XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", LL_CHANNEL, 0);
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);