#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed

1 files changed, 222 insertions, 222 deletions

diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 696fe3536c..62250cbbfd 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -1,25 +1,25 @@
 /**
  * @file   lllogininstance_test.cpp
  * @brief  Test for lllogininstance.cpp.
- * 
+ *
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -83,33 +83,33 @@ std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::
 {
     return std::string("test_trans");
 }
-	
+
 class LLLogin::Impl
 {
 };
 LLLogin::LLLogin() {}
 LLLogin::~LLLogin() {}
 LLEventPump& LLLogin::getEventPump() { return gTestPump; }
-void LLLogin::connect(const std::string& uri, const LLSD& credentials) 
+void LLLogin::connect(const std::string& uri, const LLSD& credentials)
 {
-	gLoginURI = uri;
-	gLoginCreds = credentials;
+    gLoginURI = uri;
+    gLoginCreds = credentials;
 }
 
-void LLLogin::disconnect() 
+void LLLogin::disconnect()
 {
-	gDisconnectCalled = true;
+    gDisconnectCalled = true;
 }
 
 LLSD LLCredential::getLoginParams()
 {
-	LLSD result = LLSD::emptyMap();
+    LLSD result = LLSD::emptyMap();
 
-	// legacy credential
-	result["passwd"] = "$1$testpasssd";
-	result["first"] = "myfirst";
-	result["last"] ="mylast";
-	return result;
+    // legacy credential
+    result["passwd"] = "$1$testpasssd";
+    result["first"] = "myfirst";
+    result["last"] ="mylast";
+    return result;
 }
 void LLCredential::identifierType(std::string &idType)
 {
@@ -119,9 +119,9 @@ void LLCredential::authenticatorType(std::string &idType)
 {
 }
 
-LLNotificationPtr LLNotificationsUtil::add(const std::string& name, 
-                                           const LLSD& substitutions, 
-                                           const LLSD& payload, 
+LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
+                                           const LLSD& substitutions,
+                                           const LLSD& payload,
                                            boost::function<void (const LLSD&, const LLSD&)> functor)
 {
     return LLNotificationPtr((LLNotification*)NULL);
@@ -140,33 +140,33 @@ LLGridManager::~LLGridManager()
 
 bool LLGridManager::addGrid(LLSD& grid_data)
 {
-	return true;
+    return true;
 }
 LLGridManager::LLGridManager()
 :
-	mIsInProductionGrid(false)
-{	
+    mIsInProductionGrid(false)
+{
 }
 
 void LLGridManager::getLoginURIs(std::vector<std::string>& uris)
 {
-	uris.push_back(VIEWERLOGIN_URI);
+    uris.push_back(VIEWERLOGIN_URI);
 }
 
-void LLGridManager::addSystemGrid(const std::string& label, 
-								  const std::string& name, 
-								  const std::string& login, 
-								  const std::string& helper,
-								  const std::string& login_page,
-								  const std::string& update_url_base,
-								  const std::string& web_profile_url,
-								  const std::string& login_id)
+void LLGridManager::addSystemGrid(const std::string& label,
+                                  const std::string& name,
+                                  const std::string& login,
+                                  const std::string& helper,
+                                  const std::string& login_page,
+                                  const std::string& update_url_base,
+                                  const std::string& web_profile_url,
+                                  const std::string& login_id)
 {
 }
 std::map<std::string, std::string> LLGridManager::getKnownGrids()
 {
-	std::map<std::string, std::string> result;
-	return result;
+    std::map<std::string, std::string> result;
+    return result;
 }
 
 void LLGridManager::setGridChoice(const std::string& grid_name)
@@ -175,16 +175,16 @@ void LLGridManager::setGridChoice(const std::string& grid_name)
 
 bool LLGridManager::isInProductionGrid()
 {
-	return false;
+    return false;
 }
 
 std::string LLGridManager::getSLURLBase(const std::string& grid_name)
 {
-	return "myslurl";
+    return "myslurl";
 }
 std::string LLGridManager::getAppSLURLBase(const std::string& grid_name)
 {
-	return "myappslurl";
+    return "myappslurl";
 }
 std::string LLGridManager::getGridId(const std::string& grid)
 {
@@ -196,7 +196,7 @@ std::string LLGridManager::getGridId(const std::string& grid)
 LLControlGroup gSavedSettings("Global");
 
 LLControlGroup::LLControlGroup(const std::string& name) :
-	LLInstanceTracker<LLControlGroup, std::string>(name){}
+    LLInstanceTracker<LLControlGroup, std::string>(name){}
 LLControlGroup::~LLControlGroup() {}
 void LLControlGroup::setBOOL(const std::string& name, BOOL val) {}
 BOOL LLControlGroup::getBOOL(const std::string& name) { return FALSE; }
@@ -213,10 +213,10 @@ void LLUIColorTable::saveUserSettings(void)const {}
 //-----------------------------------------------------------------------------
 #include "../llversioninfo.h"
 
-bool llHashedUniqueID(unsigned char* id) 
+bool llHashedUniqueID(unsigned char* id)
 {
-	memcpy( id, "66666666666666666666666666666666", MD5HEX_STR_SIZE );
-	return true;
+    memcpy( id, "66666666666666666666666666666666", MD5HEX_STR_SIZE );
+    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -237,9 +237,9 @@ LLPointer<LLSecAPIHandler> gSecAPIHandler;
 //static
 LLFloater* LLFloaterReg::showInstance(const std::string& name, const LLSD& key, BOOL focus)
 {
-	gTOSType = name;
-	gTOSReplyPump = &LLEventPumps::instance().obtain(key["reply_pump"]);
-	return NULL;
+    gTOSType = name;
+    gTOSReplyPump = &LLEventPumps::instance().obtain(key["reply_pump"]);
+    return NULL;
 }
 
 //----------------------------------------------------------------------------
@@ -252,59 +252,59 @@ void LLProgressView::setMessage(std::string const &){}
 // LLNotifications
 class MockNotifications : public LLNotificationsInterface
 {
-	boost::function<void (const LLSD&, const LLSD&)> mResponder;
-	int mAddedCount;
-
-public: 
-	MockNotifications() :
-		mResponder(0),
-		mAddedCount(0)
-	{
-	}
-
-	virtual ~MockNotifications() {}
-
-	/* virtual */ LLNotificationPtr add(
-					const std::string& name,
-					const LLSD& substitutions,
-					const LLSD& payload, 
-					LLNotificationFunctorRegistry::ResponseFunctor functor)
-	{
-		mResponder = functor;
-		mAddedCount++;
-		return LLNotificationPtr((LLNotification*)NULL);
-	}
-
-	void sendYesResponse()
-	{
-		LLSD notification;
-		LLSD response;
-		response = 1;
-		mResponder(notification, response);
-	}
-
-	void sendNoResponse()
-	{
-		LLSD notification;
-		LLSD response;
-		response = 2;
-		mResponder(notification, response);
-	}
-
-	void sendBogusResponse()
-	{
-		LLSD notification;
-		LLSD response;
-		response = 666;
-		mResponder(notification, response);
-	}
-
-	int addedCount() { return mAddedCount; }
+    boost::function<void (const LLSD&, const LLSD&)> mResponder;
+    int mAddedCount;
+
+public:
+    MockNotifications() :
+        mResponder(0),
+        mAddedCount(0)
+    {
+    }
+
+    virtual ~MockNotifications() {}
+
+    /* virtual */ LLNotificationPtr add(
+                    const std::string& name,
+                    const LLSD& substitutions,
+                    const LLSD& payload,
+                    LLNotificationFunctorRegistry::ResponseFunctor functor)
+    {
+        mResponder = functor;
+        mAddedCount++;
+        return LLNotificationPtr((LLNotification*)NULL);
+    }
+
+    void sendYesResponse()
+    {
+        LLSD notification;
+        LLSD response;
+        response = 1;
+        mResponder(notification, response);
+    }
+
+    void sendNoResponse()
+    {
+        LLSD notification;
+        LLSD response;
+        response = 2;
+        mResponder(notification, response);
+    }
+
+    void sendBogusResponse()
+    {
+        LLSD notification;
+        LLSD response;
+        response = 666;
+        mResponder(notification, response);
+    }
+
+    int addedCount() { return mAddedCount; }
 };
 
 S32 LLNotification::getSelectedOption(const LLSD& notification, const LLSD& response)
 {
-	return response.asInteger();
+    return response.asInteger();
 }
 
 //-----------------------------------------------------------------------------
@@ -313,8 +313,8 @@ unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {77,21,46,31,89,2};
 
 S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len)
 {
-	memcpy(unique_id, gMACAddress, len);
-	return 1;
+    memcpy(unique_id, gMACAddress, len);
+    return 1;
 }
 S32 LLMachineID::getLegacyID(unsigned char *unique_id, size_t len)
 {
@@ -324,7 +324,7 @@ S32 LLMachineID::getLegacyID(unsigned char *unique_id, size_t len)
 // misc
 std::string xml_escape_string(const std::string& in)
 {
-	return in;
+    return in;
 }
 
 /*****************************************************************************
@@ -334,50 +334,50 @@ namespace tut
 {
     struct lllogininstance_data
     {
-		lllogininstance_data() : logininstance(LLLoginInstance::getInstance())
-		{
-			// Global initialization
-			gLoginURI.clear();
-			gLoginCreds.clear();
-			gDisconnectCalled = false;
-
-			gTOSType = ""; // Set to invalid value.
-			gTOSReplyPump = 0; // clear the callback.
-
-
-			gSavedSettings.declareBOOL("NoInventoryLibrary", FALSE, "", LLControlVariable::PERSIST_NO);
-			gSavedSettings.declareBOOL("ConnectAsGod", FALSE, "", LLControlVariable::PERSIST_NO);
-			gSavedSettings.declareBOOL("UseDebugMenus", FALSE, "", LLControlVariable::PERSIST_NO);
-			gSavedSettings.declareString("ClientSettingsFile", "test_settings.xml", "", LLControlVariable::PERSIST_NO);
-			gSavedSettings.declareString("NextLoginLocation", "", "", LLControlVariable::PERSIST_NO);
-			gSavedSettings.declareBOOL("LoginLastLocation", FALSE, "", LLControlVariable::PERSIST_NO);
+        lllogininstance_data() : logininstance(LLLoginInstance::getInstance())
+        {
+            // Global initialization
+            gLoginURI.clear();
+            gLoginCreds.clear();
+            gDisconnectCalled = false;
+
+            gTOSType = ""; // Set to invalid value.
+            gTOSReplyPump = 0; // clear the callback.
+
+
+            gSavedSettings.declareBOOL("NoInventoryLibrary", FALSE, "", LLControlVariable::PERSIST_NO);
+            gSavedSettings.declareBOOL("ConnectAsGod", FALSE, "", LLControlVariable::PERSIST_NO);
+            gSavedSettings.declareBOOL("UseDebugMenus", FALSE, "", LLControlVariable::PERSIST_NO);
+            gSavedSettings.declareString("ClientSettingsFile", "test_settings.xml", "", LLControlVariable::PERSIST_NO);
+            gSavedSettings.declareString("NextLoginLocation", "", "", LLControlVariable::PERSIST_NO);
+            gSavedSettings.declareBOOL("LoginLastLocation", FALSE, "", LLControlVariable::PERSIST_NO);
             gSavedSettings.declareBOOL("CmdLineSkipUpdater", TRUE, "", LLControlVariable::PERSIST_NO);
 
-			LLSD authenticator = LLSD::emptyMap();
-			LLSD identifier = LLSD::emptyMap();
-			identifier["type"] = "agent";
-			identifier["first_name"] = "testfirst";
-			identifier["last_name"] = "testlast";
-			authenticator["passwd"] = "testpass";
-			agentCredential = new LLCredential();
-			agentCredential->setCredentialData(identifier, authenticator);
-			
-			authenticator = LLSD::emptyMap();
-			identifier = LLSD::emptyMap();
-			identifier["type"] = "account";
-			identifier["username"] = "testuser";
-			authenticator["secret"] = "testsecret";
-			accountCredential = new LLCredential();
-			accountCredential->setCredentialData(identifier, authenticator);			
-
-			logininstance->setNotificationsInterface(&notifications);
-			logininstance->setPlatformInfo("win", "1.3.5", "Windows Bogus Version 100.6.6.6");
-		}
-
-		LLLoginInstance* logininstance;
-		LLPointer<LLCredential> agentCredential;
-		LLPointer<LLCredential> accountCredential;
-		MockNotifications notifications;
+            LLSD authenticator = LLSD::emptyMap();
+            LLSD identifier = LLSD::emptyMap();
+            identifier["type"] = "agent";
+            identifier["first_name"] = "testfirst";
+            identifier["last_name"] = "testlast";
+            authenticator["passwd"] = "testpass";
+            agentCredential = new LLCredential();
+            agentCredential->setCredentialData(identifier, authenticator);
+
+            authenticator = LLSD::emptyMap();
+            identifier = LLSD::emptyMap();
+            identifier["type"] = "account";
+            identifier["username"] = "testuser";
+            authenticator["secret"] = "testsecret";
+            accountCredential = new LLCredential();
+            accountCredential->setCredentialData(identifier, authenticator);
+
+            logininstance->setNotificationsInterface(&notifications);
+            logininstance->setPlatformInfo("win", "1.3.5", "Windows Bogus Version 100.6.6.6");
+        }
+
+        LLLoginInstance* logininstance;
+        LLPointer<LLCredential> agentCredential;
+        LLPointer<LLCredential> accountCredential;
+        MockNotifications notifications;
     };
 
     typedef test_group<lllogininstance_data> lllogininstance_group;
@@ -387,103 +387,103 @@ namespace tut
     template<> template<>
     void lllogininstance_object::test<1>()
     {
-		set_test_name("Test Simple Success And Disconnect");
+        set_test_name("Test Simple Success And Disconnect");
 
-		// Test default connect.
-		logininstance->connect(agentCredential);
+        // Test default connect.
+        logininstance->connect(agentCredential);
 
-		ensure_equals("Default connect uri", gLoginURI, VIEWERLOGIN_URI); 
+        ensure_equals("Default connect uri", gLoginURI, VIEWERLOGIN_URI);
 
-		// Dummy success response.
-		LLSD response;
-		response["state"] = "online";
-		response["change"] = "connect";
-		response["progress"] = 1.0;
-		response["transfer_rate"] = 7;
-		response["data"] = "test_data";
+        // Dummy success response.
+        LLSD response;
+        response["state"] = "online";
+        response["change"] = "connect";
+        response["progress"] = 1.0;
+        response["transfer_rate"] = 7;
+        response["data"] = "test_data";
 
-		gTestPump.post(response);
+        gTestPump.post(response);
 
-		ensure("Success response", logininstance->authSuccess());
-		ensure_equals("Test Response Data", logininstance->getResponse().asString(), "test_data");
+        ensure("Success response", logininstance->authSuccess());
+        ensure_equals("Test Response Data", logininstance->getResponse().asString(), "test_data");
 
-		logininstance->disconnect();
+        logininstance->disconnect();
 
-		ensure_equals("Called Login Module Disconnect", gDisconnectCalled, true);
+        ensure_equals("Called Login Module Disconnect", gDisconnectCalled, true);
 
-		response.clear();
-		response["state"] = "offline";
-		response["change"] = "disconnect";
-		response["progress"] = 0.0;
-		response["transfer_rate"] = 0;
-		response["data"] = "test_data";
+        response.clear();
+        response["state"] = "offline";
+        response["change"] = "disconnect";
+        response["progress"] = 0.0;
+        response["transfer_rate"] = 0;
+        response["data"] = "test_data";
 
-		gTestPump.post(response);
+        gTestPump.post(response);
 
-		ensure("Disconnected", !(logininstance->authSuccess()));
+        ensure("Disconnected", !(logininstance->authSuccess()));
     }
 
     template<> template<>
     void lllogininstance_object::test<2>()
     {
-		set_test_name("Test User TOS/Critical message Interaction");
-
-		const std::string test_uri = "testing-uri";
-
-		// Test default connect.
-		logininstance->connect(test_uri, agentCredential);
-
-		// connect should call LLLogin::connect to init gLoginURI and gLoginCreds.
-		ensure_equals("Default connect uri", gLoginURI, "testing-uri"); 
-		ensure_equals("Default for agree to tos", gLoginCreds["params"]["agree_to_tos"].asBoolean(), false);
-		ensure_equals("Default for read critical", gLoginCreds["params"]["read_critical"].asBoolean(), false);
-
-		// TOS failure response.
-		LLSD response;
-		response["state"] = "offline";
-		response["change"] = "fail.login";
-		response["progress"] = 0.0;
-		response["transfer_rate"] = 7;
-		response["data"]["reason"] = "tos";
-		gTestPump.post(response);
-
-		ensure_equals("TOS Dialog type", gTOSType, "message_tos");
-		ensure("TOS callback given", gTOSReplyPump != 0);
-		gTOSReplyPump->post(false); // Call callback denying TOS.
-		ensure("No TOS, failed auth", logininstance->authFailure());
-
-		// Start again.
-		logininstance->connect(test_uri, agentCredential);
-		gTestPump.post(response); // Fail for tos again.
-		gTOSReplyPump->post(true); // Accept tos, should reconnect w/ agree_to_tos.
-		ensure_equals("Accepted agree to tos", gLoginCreds["params"]["agree_to_tos"].asBoolean(), true);
-		ensure("Incomplete login status", !logininstance->authFailure() && !logininstance->authSuccess());
-	
-		// Fail connection, attempt connect again.
-		// The new request should have reset agree to tos to default.
-		response["data"]["reason"] = "key"; // bad creds.
-		gTestPump.post(response);
-		ensure("TOS auth failure", logininstance->authFailure());
-
-		logininstance->connect(test_uri, agentCredential);
-		ensure_equals("Reset to default for agree to tos", gLoginCreds["params"]["agree_to_tos"].asBoolean(), false);
-
-		// Critical Message failure response.
-		logininstance->connect(test_uri, agentCredential);
-		response["data"]["reason"] = "critical"; // Change response to "critical message"
-		gTestPump.post(response);
-
-		ensure_equals("TOS Dialog type", gTOSType, "message_critical");
-		ensure("TOS callback given", gTOSReplyPump != 0);
-		gTOSReplyPump->post(true); 
-		ensure_equals("Accepted read critical message", gLoginCreds["params"]["read_critical"].asBoolean(), true);
-		ensure("Incomplete login status", !logininstance->authFailure() && !logininstance->authSuccess());
-
-		// Fail then attempt new connection
-		response["data"]["reason"] = "key"; // bad creds.
-		gTestPump.post(response);
-		ensure("TOS auth failure", logininstance->authFailure());
-		logininstance->connect(test_uri, agentCredential);
-		ensure_equals("Default for agree to tos", gLoginCreds["params"]["read_critical"].asBoolean(), false);
-	}
+        set_test_name("Test User TOS/Critical message Interaction");
+
+        const std::string test_uri = "testing-uri";
+
+        // Test default connect.
+        logininstance->connect(test_uri, agentCredential);
+
+        // connect should call LLLogin::connect to init gLoginURI and gLoginCreds.
+        ensure_equals("Default connect uri", gLoginURI, "testing-uri");
+        ensure_equals("Default for agree to tos", gLoginCreds["params"]["agree_to_tos"].asBoolean(), false);
+        ensure_equals("Default for read critical", gLoginCreds["params"]["read_critical"].asBoolean(), false);
+
+        // TOS failure response.
+        LLSD response;
+        response["state"] = "offline";
+        response["change"] = "fail.login";
+        response["progress"] = 0.0;
+        response["transfer_rate"] = 7;
+        response["data"]["reason"] = "tos";
+        gTestPump.post(response);
+
+        ensure_equals("TOS Dialog type", gTOSType, "message_tos");
+        ensure("TOS callback given", gTOSReplyPump != 0);
+        gTOSReplyPump->post(false); // Call callback denying TOS.
+        ensure("No TOS, failed auth", logininstance->authFailure());
+
+        // Start again.
+        logininstance->connect(test_uri, agentCredential);
+        gTestPump.post(response); // Fail for tos again.
+        gTOSReplyPump->post(true); // Accept tos, should reconnect w/ agree_to_tos.
+        ensure_equals("Accepted agree to tos", gLoginCreds["params"]["agree_to_tos"].asBoolean(), true);
+        ensure("Incomplete login status", !logininstance->authFailure() && !logininstance->authSuccess());
+
+        // Fail connection, attempt connect again.
+        // The new request should have reset agree to tos to default.
+        response["data"]["reason"] = "key"; // bad creds.
+        gTestPump.post(response);
+        ensure("TOS auth failure", logininstance->authFailure());
+
+        logininstance->connect(test_uri, agentCredential);
+        ensure_equals("Reset to default for agree to tos", gLoginCreds["params"]["agree_to_tos"].asBoolean(), false);
+
+        // Critical Message failure response.
+        logininstance->connect(test_uri, agentCredential);
+        response["data"]["reason"] = "critical"; // Change response to "critical message"
+        gTestPump.post(response);
+
+        ensure_equals("TOS Dialog type", gTOSType, "message_critical");
+        ensure("TOS callback given", gTOSReplyPump != 0);
+        gTOSReplyPump->post(true);
+        ensure_equals("Accepted read critical message", gLoginCreds["params"]["read_critical"].asBoolean(), true);
+        ensure("Incomplete login status", !logininstance->authFailure() && !logininstance->authSuccess());
+
+        // Fail then attempt new connection
+        response["data"]["reason"] = "key"; // bad creds.
+        gTestPump.post(response);
+        ensure("TOS auth failure", logininstance->authFailure());
+        logininstance->connect(test_uri, agentCredential);
+        ensure_equals("Default for agree to tos", gLoginCreds["params"]["read_critical"].asBoolean(), false);
+    }
 }