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

Merge branch 'dev_copybootch' of github.com:HazimGazov/Inertia into dev_copybootch

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-03 02:06:21 -03:00
parent e13f747a05 0ad54f2f7d
commit 1b58b49dc1
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
indra/newview/lluserauth.cpp
View File

@@ -49,10 +49,6 @@
#include <curl/curl.h>
#include <xmlrpc-epi/xmlrpc.h>
// <edit>
#include <boost/lexical_cast.hpp>
// </edit>
// Don't define PLATFORM_STRING for unknown platforms - they need
// to get added to the login cgi script, so we want this to cause an
@@ -134,35 +130,35 @@ 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
// <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(
gSavedSettings.getString("SpecifiedChannel") + " " +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionMaj")) + "." +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionMin")) + "." +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionPatch")) + "." +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionBuild"))
llformat("%d", gSavedSettings.getU32("SpecifiedVersionMaj")) + "." +
llformat("%d", gSavedSettings.getU32("SpecifiedVersionMin")) + "." +
llformat("%d", gSavedSettings.getU32("SpecifiedVersionPatch")) + "." +
llformat("%d", gSavedSettings.getU32("SpecifiedVersionBuild"))
).c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
// <edit>
if(gSavedSettings.getBOOL("SpecifyMAC"))
XMLRPC_VectorAppendString(params, "mac", gSavedSettings.getString("SpecifiedMAC").c_str(), 0);
else
// </edit>
// <edit>
if(gSavedSettings.getBOOL("SpecifyMAC"))
XMLRPC_VectorAppendString(params, "mac", gSavedSettings.getString("SpecifiedMAC").c_str(), 0);
else
// </edit>
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
// A bit of security through obscurity: id0 is volume_serial
// <edit>
if(gSavedSettings.getBOOL("SpecifyID0"))
XMLRPC_VectorAppendString(params, "id0", gSavedSettings.getString("SpecifiedID0").c_str(), 0);
else
// </edit>
// <edit>
if(gSavedSettings.getBOOL("SpecifyID0"))
XMLRPC_VectorAppendString(params, "id0", gSavedSettings.getString("SpecifiedID0").c_str(), 0);
else
// </edit>
XMLRPC_VectorAppendString(params, "id0", hashed_volume_serial.c_str(), 0);
if (skip_optional)
{
@@ -244,35 +240,35 @@ 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);
// <edit>
//XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
//XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").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(
gSavedSettings.getString("SpecifiedChannel") + " " +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionMaj")) + "." +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionMin")) + "." +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionPatch")) + "." +
boost::lexical_cast<std::string>(gSavedSettings.getU32("SpecifiedVersionBuild"))
llformat("%d", gSavedSettings.getU32("SpecifiedVersionMaj")) + "." +
llformat("%d", gSavedSettings.getU32("SpecifiedVersionMin")) + "." +
llformat("%d", gSavedSettings.getU32("SpecifiedVersionPatch")) + "." +
llformat("%d", gSavedSettings.getU32("SpecifiedVersionBuild"))
).c_str(), 0); // Includes channel name
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("SpecifiedChannel").c_str(), 0);
// </edit>
XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
// <edit>
if(gSavedSettings.getBOOL("SpecifyMAC"))
XMLRPC_VectorAppendString(params, "mac", gSavedSettings.getString("SpecifiedMAC").c_str(), 0);
else
// </edit>
// <edit>
if(gSavedSettings.getBOOL("SpecifyMAC"))
XMLRPC_VectorAppendString(params, "mac", gSavedSettings.getString("SpecifiedMAC").c_str(), 0);
else
// </edit>
XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
// A bit of security through obscurity: id0 is volume_serial
// <edit>
if(gSavedSettings.getBOOL("SpecifyID0"))
XMLRPC_VectorAppendString(params, "id0", gSavedSettings.getString("SpecifiedID0").c_str(), 0);
else
// </edit>
// <edit>
if(gSavedSettings.getBOOL("SpecifyID0"))
XMLRPC_VectorAppendString(params, "id0", gSavedSettings.getString("SpecifiedID0").c_str(), 0);
else
// </edit>
XMLRPC_VectorAppendString(params, "id0", hashed_volume_serial.c_str(), 0);
if (skip_optional)
{

4
indra/newview/llviewermenu.h
View File

@@ -64,6 +64,10 @@ void handle_deselect(void*);
void handle_delete_object();
void handle_duplicate(void*);
void handle_duplicate_in_place(void*);
// <edit>
void handle_reopen_with_hex_editor(void*);
void handle_close_all_notifications(void*);
// </edit>
BOOL enable_not_have_card(void *userdata);
void process_grant_godlike_powers(LLMessageSystem* msg, void**);