Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 113 insertions, 113 deletions

diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index b53839977e..15ca87c326 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterperms.cpp
  * @brief Asset creation permission preferences.
  * @author Jonathan Yap
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -48,127 +48,127 @@ LLFloaterPerms::LLFloaterPerms(const LLSD& seed)
 
 BOOL LLFloaterPerms::postBuild()
 {
-	return TRUE;
+    return TRUE;
 }
 
-//static 
+//static
 U32 LLFloaterPerms::getGroupPerms(std::string prefix)
-{	
-	return gSavedSettings.getBOOL(prefix+"ShareWithGroup") ? PERM_COPY | PERM_MOVE | PERM_MODIFY : PERM_NONE;
+{
+    return gSavedSettings.getBOOL(prefix+"ShareWithGroup") ? PERM_COPY | PERM_MOVE | PERM_MODIFY : PERM_NONE;
 }
 
-//static 
+//static
 U32 LLFloaterPerms::getEveryonePerms(std::string prefix)
 {
-	return gSavedSettings.getBOOL(prefix+"EveryoneCopy") ? PERM_COPY : PERM_NONE;
+    return gSavedSettings.getBOOL(prefix+"EveryoneCopy") ? PERM_COPY : PERM_NONE;
 }
 
-//static 
+//static
 U32 LLFloaterPerms::getNextOwnerPerms(std::string prefix)
 {
-	U32 flags = PERM_MOVE;
-	if ( gSavedSettings.getBOOL(prefix+"NextOwnerCopy") )
-	{
-		flags |= PERM_COPY;
-	}
-	if ( gSavedSettings.getBOOL(prefix+"NextOwnerModify") )
-	{
-		flags |= PERM_MODIFY;
-	}
-	if ( gSavedSettings.getBOOL(prefix+"NextOwnerTransfer") )
-	{
-		flags |= PERM_TRANSFER;
-	}
-	return flags;
+    U32 flags = PERM_MOVE;
+    if ( gSavedSettings.getBOOL(prefix+"NextOwnerCopy") )
+    {
+        flags |= PERM_COPY;
+    }
+    if ( gSavedSettings.getBOOL(prefix+"NextOwnerModify") )
+    {
+        flags |= PERM_MODIFY;
+    }
+    if ( gSavedSettings.getBOOL(prefix+"NextOwnerTransfer") )
+    {
+        flags |= PERM_TRANSFER;
+    }
+    return flags;
 }
 
-//static 
+//static
 U32 LLFloaterPerms::getNextOwnerPermsInverted(std::string prefix)
 {
-	// Sets bits for permissions that are off
-	U32 flags = PERM_MOVE;
-	if ( !gSavedSettings.getBOOL(prefix+"NextOwnerCopy") )
-	{
-		flags |= PERM_COPY;
-	}
-	if ( !gSavedSettings.getBOOL(prefix+"NextOwnerModify") )
-	{
-		flags |= PERM_MODIFY;
-	}
-	if ( !gSavedSettings.getBOOL(prefix+"NextOwnerTransfer") )
-	{
-		flags |= PERM_TRANSFER;
-	}
-	return flags;
+    // Sets bits for permissions that are off
+    U32 flags = PERM_MOVE;
+    if ( !gSavedSettings.getBOOL(prefix+"NextOwnerCopy") )
+    {
+        flags |= PERM_COPY;
+    }
+    if ( !gSavedSettings.getBOOL(prefix+"NextOwnerModify") )
+    {
+        flags |= PERM_MODIFY;
+    }
+    if ( !gSavedSettings.getBOOL(prefix+"NextOwnerTransfer") )
+    {
+        flags |= PERM_TRANSFER;
+    }
+    return flags;
 }
 
 static bool mCapSent = false;
 
 LLFloaterPermsDefault::LLFloaterPermsDefault(const LLSD& seed)
-	: LLFloater(seed)
+    : LLFloater(seed)
 {
-	mCommitCallbackRegistrar.add("PermsDefault.Copy", boost::bind(&LLFloaterPermsDefault::onCommitCopy, this, _2));
-	mCommitCallbackRegistrar.add("PermsDefault.OK", boost::bind(&LLFloaterPermsDefault::onClickOK, this));
-	mCommitCallbackRegistrar.add("PermsDefault.Cancel", boost::bind(&LLFloaterPermsDefault::onClickCancel, this));
+    mCommitCallbackRegistrar.add("PermsDefault.Copy", boost::bind(&LLFloaterPermsDefault::onCommitCopy, this, _2));
+    mCommitCallbackRegistrar.add("PermsDefault.OK", boost::bind(&LLFloaterPermsDefault::onClickOK, this));
+    mCommitCallbackRegistrar.add("PermsDefault.Cancel", boost::bind(&LLFloaterPermsDefault::onClickCancel, this));
 }
 
- 
+
 // String equivalents of enum Categories - initialization order must match enum order!
 const std::string LLFloaterPermsDefault::sCategoryNames[CAT_LAST] =
 {
-	"Objects",
-	"Uploads",
-	"Scripts",
-	"Notecards",
-	"Gestures",
-	"Wearables",
-	"Settings",
-	"Materials"
+    "Objects",
+    "Uploads",
+    "Scripts",
+    "Notecards",
+    "Gestures",
+    "Wearables",
+    "Settings",
+    "Materials"
 };
 
 BOOL LLFloaterPermsDefault::postBuild()
 {
-	if(!gSavedSettings.getBOOL("DefaultUploadPermissionsConverted"))
-	{
-		gSavedSettings.setBOOL("UploadsEveryoneCopy", gSavedSettings.getBOOL("EveryoneCopy"));
-		gSavedSettings.setBOOL("UploadsNextOwnerCopy", gSavedSettings.getBOOL("NextOwnerCopy"));
-		gSavedSettings.setBOOL("UploadsNextOwnerModify", gSavedSettings.getBOOL("NextOwnerModify"));
-		gSavedSettings.setBOOL("UploadsNextOwnerTransfer", gSavedSettings.getBOOL("NextOwnerTransfer"));
-		gSavedSettings.setBOOL("UploadsShareWithGroup", gSavedSettings.getBOOL("ShareWithGroup"));
-		gSavedSettings.setBOOL("DefaultUploadPermissionsConverted", true);
-	}
-
-	mCloseSignal.connect(boost::bind(&LLFloaterPermsDefault::cancel, this));
-
-	refresh();
-	
-	return true;
+    if(!gSavedSettings.getBOOL("DefaultUploadPermissionsConverted"))
+    {
+        gSavedSettings.setBOOL("UploadsEveryoneCopy", gSavedSettings.getBOOL("EveryoneCopy"));
+        gSavedSettings.setBOOL("UploadsNextOwnerCopy", gSavedSettings.getBOOL("NextOwnerCopy"));
+        gSavedSettings.setBOOL("UploadsNextOwnerModify", gSavedSettings.getBOOL("NextOwnerModify"));
+        gSavedSettings.setBOOL("UploadsNextOwnerTransfer", gSavedSettings.getBOOL("NextOwnerTransfer"));
+        gSavedSettings.setBOOL("UploadsShareWithGroup", gSavedSettings.getBOOL("ShareWithGroup"));
+        gSavedSettings.setBOOL("DefaultUploadPermissionsConverted", true);
+    }
+
+    mCloseSignal.connect(boost::bind(&LLFloaterPermsDefault::cancel, this));
+
+    refresh();
+
+    return true;
 }
 
 void LLFloaterPermsDefault::onClickOK()
 {
-	ok();
-	closeFloater();
+    ok();
+    closeFloater();
 }
 
 void LLFloaterPermsDefault::onClickCancel()
 {
-	cancel();
-	closeFloater();
+    cancel();
+    closeFloater();
 }
 
 void LLFloaterPermsDefault::onCommitCopy(const LLSD& user_data)
 {
-	// Implements fair use
-	std::string prefix = user_data.asString();
-
-	BOOL copyable = gSavedSettings.getBOOL(prefix+"NextOwnerCopy");
-	if(!copyable)
-	{
-		gSavedSettings.setBOOL(prefix+"NextOwnerTransfer", TRUE);
-	}
-	LLCheckBoxCtrl* xfer = getChild<LLCheckBoxCtrl>(prefix+"_transfer");
-	xfer->setEnabled(copyable);
+    // Implements fair use
+    std::string prefix = user_data.asString();
+
+    BOOL copyable = gSavedSettings.getBOOL(prefix+"NextOwnerCopy");
+    if(!copyable)
+    {
+        gSavedSettings.setBOOL(prefix+"NextOwnerTransfer", TRUE);
+    }
+    LLCheckBoxCtrl* xfer = getChild<LLCheckBoxCtrl>(prefix+"_transfer");
+    xfer->setEnabled(copyable);
 }
 
 const int MAX_HTTP_RETRIES = 5;
@@ -176,10 +176,10 @@ const float RETRY_TIMEOUT = 5.0;
 
 void LLFloaterPermsDefault::sendInitialPerms()
 {
-	if(!mCapSent)
-	{
-		updateCap();
-	}
+    if(!mCapSent)
+    {
+        updateCap();
+    }
 }
 
 void LLFloaterPermsDefault::updateCap()
@@ -189,13 +189,13 @@ void LLFloaterPermsDefault::updateCap()
         LL_WARNS("Avatar") << "Region not set, cannot request capability update" << LL_ENDL;
         return;
     }
-	std::string object_url = gAgent.getRegion()->getCapability("AgentPreferences");
+    std::string object_url = gAgent.getRegion()->getCapability("AgentPreferences");
 
-	if(!object_url.empty())
-	{
+    if(!object_url.empty())
+    {
         LLCoros::instance().launch("LLFloaterPermsDefault::updateCapCoro",
             boost::bind(&LLFloaterPermsDefault::updateCapCoro, object_url));
-	}
+    }
     else
     {
         LL_DEBUGS("ObjectPermissionsFloater") << "AgentPreferences cap not available." << LL_ENDL;
@@ -267,40 +267,40 @@ void LLFloaterPermsDefault::updateCapCoro(std::string url)
 
 void LLFloaterPermsDefault::setCapSent(bool cap_sent)
 {
-	mCapSent = cap_sent;
+    mCapSent = cap_sent;
 }
 
 void LLFloaterPermsDefault::ok()
 {
-//	Changes were already applied automatically to saved settings.
-//	Refreshing internal values makes it official.
-	refresh();
+//  Changes were already applied automatically to saved settings.
+//  Refreshing internal values makes it official.
+    refresh();
 
 // We know some setting has changed but not which one.  Just in case it was a setting for
 // object permissions tell the server what the values are.
-	updateCap();
+    updateCap();
 }
 
 void LLFloaterPermsDefault::cancel()
 {
-	for (U32 iter = CAT_OBJECTS; iter < CAT_LAST; iter++)
-	{
-		gSavedSettings.setBOOL(sCategoryNames[iter]+"NextOwnerCopy",		mNextOwnerCopy[iter]);
-		gSavedSettings.setBOOL(sCategoryNames[iter]+"NextOwnerModify",		mNextOwnerModify[iter]);
-		gSavedSettings.setBOOL(sCategoryNames[iter]+"NextOwnerTransfer",	mNextOwnerTransfer[iter]);
-		gSavedSettings.setBOOL(sCategoryNames[iter]+"ShareWithGroup",		mShareWithGroup[iter]);
-		gSavedSettings.setBOOL(sCategoryNames[iter]+"EveryoneCopy",			mEveryoneCopy[iter]);
-	}
+    for (U32 iter = CAT_OBJECTS; iter < CAT_LAST; iter++)
+    {
+        gSavedSettings.setBOOL(sCategoryNames[iter]+"NextOwnerCopy",        mNextOwnerCopy[iter]);
+        gSavedSettings.setBOOL(sCategoryNames[iter]+"NextOwnerModify",      mNextOwnerModify[iter]);
+        gSavedSettings.setBOOL(sCategoryNames[iter]+"NextOwnerTransfer",    mNextOwnerTransfer[iter]);
+        gSavedSettings.setBOOL(sCategoryNames[iter]+"ShareWithGroup",       mShareWithGroup[iter]);
+        gSavedSettings.setBOOL(sCategoryNames[iter]+"EveryoneCopy",         mEveryoneCopy[iter]);
+    }
 }
 
 void LLFloaterPermsDefault::refresh()
 {
-	for (U32 iter = CAT_OBJECTS; iter < CAT_LAST; iter++)
-	{
-		mShareWithGroup[iter]    = gSavedSettings.getBOOL(sCategoryNames[iter]+"ShareWithGroup");
-		mEveryoneCopy[iter]      = gSavedSettings.getBOOL(sCategoryNames[iter]+"EveryoneCopy");
-		mNextOwnerCopy[iter]     = gSavedSettings.getBOOL(sCategoryNames[iter]+"NextOwnerCopy");
-		mNextOwnerModify[iter]   = gSavedSettings.getBOOL(sCategoryNames[iter]+"NextOwnerModify");
-		mNextOwnerTransfer[iter] = gSavedSettings.getBOOL(sCategoryNames[iter]+"NextOwnerTransfer");
-	}
+    for (U32 iter = CAT_OBJECTS; iter < CAT_LAST; iter++)
+    {
+        mShareWithGroup[iter]    = gSavedSettings.getBOOL(sCategoryNames[iter]+"ShareWithGroup");
+        mEveryoneCopy[iter]      = gSavedSettings.getBOOL(sCategoryNames[iter]+"EveryoneCopy");
+        mNextOwnerCopy[iter]     = gSavedSettings.getBOOL(sCategoryNames[iter]+"NextOwnerCopy");
+        mNextOwnerModify[iter]   = gSavedSettings.getBOOL(sCategoryNames[iter]+"NextOwnerModify");
+        mNextOwnerTransfer[iter] = gSavedSettings.getBOOL(sCategoryNames[iter]+"NextOwnerTransfer");
+    }
 }