Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 76 insertions, 76 deletions

diff --git a/indra/newview/llagentaccess.cpp b/indra/newview/llagentaccess.cpp
index c4ee321e04..7d834b2926 100644
--- a/indra/newview/llagentaccess.cpp
+++ b/indra/newview/llagentaccess.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llagentaccess.cpp
  * @brief LLAgentAccess class implementation - manages maturity and godmode info
  *
  * $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$
  */
@@ -30,153 +30,153 @@
 #include "llcontrol.h"
 
 LLAgentAccess::LLAgentAccess(LLControlGroup& savedSettings) :
-	mSavedSettings(savedSettings),
-	mAccess(SIM_ACCESS_PG),
-	mAdminOverride(false),
-	mGodLevel(GOD_NOT)
+    mSavedSettings(savedSettings),
+    mAccess(SIM_ACCESS_PG),
+    mAdminOverride(false),
+    mGodLevel(GOD_NOT)
 {
 }
 
-bool LLAgentAccess::getAdminOverride() const	
-{ 
-	return mAdminOverride; 
+bool LLAgentAccess::getAdminOverride() const
+{
+    return mAdminOverride;
 }
 
 void LLAgentAccess::setAdminOverride(bool b)
-{ 
-	mAdminOverride = b; 
+{
+    mAdminOverride = b;
 }
 
 void LLAgentAccess::setGodLevel(U8 god_level)
-{ 
-	mGodLevel = god_level; 
+{
+    mGodLevel = god_level;
 }
 
 bool LLAgentAccess::isGodlike() const
 {
 #ifdef HACKED_GODLIKE_VIEWER
-	return true;
+    return true;
 #else
-	if(mAdminOverride) return true;
-	return mGodLevel > GOD_NOT;
+    if(mAdminOverride) return true;
+    return mGodLevel > GOD_NOT;
 #endif
 }
 
 bool LLAgentAccess::isGodlikeWithoutAdminMenuFakery() const
 {
 #ifdef HACKED_GODLIKE_VIEWER
-	return true;
+    return true;
 #else
-	return mGodLevel > GOD_NOT;
+    return mGodLevel > GOD_NOT;
 #endif
 }
 
 U8 LLAgentAccess::getGodLevel() const
 {
 #ifdef HACKED_GODLIKE_VIEWER
-	return GOD_MAINTENANCE;
+    return GOD_MAINTENANCE;
 #else
-	if(mAdminOverride) return GOD_FULL; // :(
-	return mGodLevel;
+    if(mAdminOverride) return GOD_FULL; // :(
+    return mGodLevel;
 #endif
 }
 
 bool LLAgentAccess::wantsPGOnly() const
 {
-	return (prefersPG() || isTeen()) && !isGodlike();
+    return (prefersPG() || isTeen()) && !isGodlike();
 }
 
 bool LLAgentAccess::canAccessMature() const
 {
-	// if you prefer mature, you're either mature or adult, and
-	// therefore can access all mature content
-	return isGodlike() || (prefersMature() && !isTeen());
+    // if you prefer mature, you're either mature or adult, and
+    // therefore can access all mature content
+    return isGodlike() || (prefersMature() && !isTeen());
 }
 
 bool LLAgentAccess::canAccessAdult() const
 {
-	// if you prefer adult, you must BE adult.
-	return isGodlike() || (prefersAdult() && isAdult());
+    // if you prefer adult, you must BE adult.
+    return isGodlike() || (prefersAdult() && isAdult());
 }
 
 bool LLAgentAccess::prefersPG() const
 {
-	U32 access = mSavedSettings.getU32("PreferredMaturity");
-	return access < SIM_ACCESS_MATURE;
+    U32 access = mSavedSettings.getU32("PreferredMaturity");
+    return access < SIM_ACCESS_MATURE;
 }
 
 bool LLAgentAccess::prefersMature() const
 {
-	U32 access = mSavedSettings.getU32("PreferredMaturity");
-	return access >= SIM_ACCESS_MATURE;
+    U32 access = mSavedSettings.getU32("PreferredMaturity");
+    return access >= SIM_ACCESS_MATURE;
 }
 
 bool LLAgentAccess::prefersAdult() const
 {
-	U32 access = mSavedSettings.getU32("PreferredMaturity");
-	return access >= SIM_ACCESS_ADULT;
+    U32 access = mSavedSettings.getU32("PreferredMaturity");
+    return access >= SIM_ACCESS_ADULT;
 }
 
 bool LLAgentAccess::isTeen() const
 {
-	return mAccess < SIM_ACCESS_MATURE;
+    return mAccess < SIM_ACCESS_MATURE;
 }
 
 bool LLAgentAccess::isMature() const
 {
-	return mAccess >= SIM_ACCESS_MATURE;
+    return mAccess >= SIM_ACCESS_MATURE;
 }
 
 bool LLAgentAccess::isAdult() const
 {
-	return mAccess >= SIM_ACCESS_ADULT;
+    return mAccess >= SIM_ACCESS_ADULT;
 }
 
-//static 
+//static
 int LLAgentAccess::convertTextToMaturity(char text)
 {
-	if ('A' == text)
-	{
-		return SIM_ACCESS_ADULT;
-	}
-	else if ('M'== text)
-	{
-		return SIM_ACCESS_MATURE;
-	}
-	else if ('P'== text)
-	{
-		return SIM_ACCESS_PG;
-	}
-	return SIM_ACCESS_MIN;
+    if ('A' == text)
+    {
+        return SIM_ACCESS_ADULT;
+    }
+    else if ('M'== text)
+    {
+        return SIM_ACCESS_MATURE;
+    }
+    else if ('P'== text)
+    {
+        return SIM_ACCESS_PG;
+    }
+    return SIM_ACCESS_MIN;
 }
 
 void LLAgentAccess::setMaturity(char text)
 {
-	mAccess = LLAgentAccess::convertTextToMaturity(text);
-	U32 preferred_access = mSavedSettings.getU32("PreferredMaturity");
-	while (!canSetMaturity(preferred_access))
-	{
-		if (preferred_access == SIM_ACCESS_ADULT)
-		{
-			preferred_access = SIM_ACCESS_MATURE;
-		}
-		else
-		{
-			// Mature or invalid access gets set to PG
-			preferred_access = SIM_ACCESS_PG;
-		}
-	}
-	mSavedSettings.setU32("PreferredMaturity", preferred_access);
+    mAccess = LLAgentAccess::convertTextToMaturity(text);
+    U32 preferred_access = mSavedSettings.getU32("PreferredMaturity");
+    while (!canSetMaturity(preferred_access))
+    {
+        if (preferred_access == SIM_ACCESS_ADULT)
+        {
+            preferred_access = SIM_ACCESS_MATURE;
+        }
+        else
+        {
+            // Mature or invalid access gets set to PG
+            preferred_access = SIM_ACCESS_PG;
+        }
+    }
+    mSavedSettings.setU32("PreferredMaturity", preferred_access);
 }
 
 bool LLAgentAccess::canSetMaturity(S32 maturity)
 {
-	if (isGodlike()) // Gods can always set their Maturity level
-		return true;
-	if (isAdult()) // Adults can always set their Maturity level
-		return true;
-	if (maturity == SIM_ACCESS_PG || (maturity == SIM_ACCESS_MATURE && isMature()))
-		return true;
-	else
-		return false;
+    if (isGodlike()) // Gods can always set their Maturity level
+        return true;
+    if (isAdult()) // Adults can always set their Maturity level
+        return true;
+    if (maturity == SIM_ACCESS_PG || (maturity == SIM_ACCESS_MATURE && isMature()))
+        return true;
+    else
+        return false;
 }