Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 64 insertions, 64 deletions

diff --git a/indra/llinventory/llparcelflags.h b/indra/llinventory/llparcelflags.h
index 4cffa83cc1..25f8ae1984 100644
--- a/indra/llinventory/llparcelflags.h
+++ b/indra/llinventory/llparcelflags.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llparcelflags.h
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -29,71 +29,71 @@
 //---------------------------------------------------------------------------
 // Parcel Flags (PF) constants
 //---------------------------------------------------------------------------
-const U32 PF_ALLOW_FLY			= 1 << 0;// Can start flying
+const U32 PF_ALLOW_FLY          = 1 << 0;// Can start flying
 const U32 PF_ALLOW_OTHER_SCRIPTS= 1 << 1;// Scripts by others can run.
-const U32 PF_FOR_SALE			= 1 << 2;// Can buy this land
-const U32 PF_FOR_SALE_OBJECTS	= 1 << 7;// Can buy all objects on this land
-const U32 PF_ALLOW_LANDMARK		= 1 << 3;// Always true/deprecated
-const U32 PF_ALLOW_TERRAFORM	= 1 << 4;
-const U32 PF_ALLOW_DAMAGE		= 1 << 5;
-const U32 PF_CREATE_OBJECTS		= 1 << 6;
+const U32 PF_FOR_SALE           = 1 << 2;// Can buy this land
+const U32 PF_FOR_SALE_OBJECTS   = 1 << 7;// Can buy all objects on this land
+const U32 PF_ALLOW_LANDMARK     = 1 << 3;// Always true/deprecated
+const U32 PF_ALLOW_TERRAFORM    = 1 << 4;
+const U32 PF_ALLOW_DAMAGE       = 1 << 5;
+const U32 PF_CREATE_OBJECTS     = 1 << 6;
 // 7 is moved above
-const U32 PF_USE_ACCESS_GROUP	= 1 << 8;
-const U32 PF_USE_ACCESS_LIST	= 1 << 9;
-const U32 PF_USE_BAN_LIST		= 1 << 10;
-const U32 PF_USE_PASS_LIST		= 1 << 11;
-const U32 PF_SHOW_DIRECTORY		= 1 << 12;
-const U32 PF_ALLOW_DEED_TO_GROUP		= 1 << 13;
-const U32 PF_CONTRIBUTE_WITH_DEED		= 1 << 14;
-const U32 PF_SOUND_LOCAL				= 1 << 15;	// Hear sounds in this parcel only
-const U32 PF_SELL_PARCEL_OBJECTS		= 1 << 16;	// Objects on land are included as part of the land when the land is sold
-const U32 PF_ALLOW_PUBLISH				= 1 << 17;	// Allow publishing of parcel information on the web
-const U32 PF_MATURE_PUBLISH				= 1 << 18;	// The information on this parcel is mature
-const U32 PF_URL_WEB_PAGE				= 1 << 19;	// The "media URL" is an HTML page
-const U32 PF_URL_RAW_HTML				= 1 << 20;	// The "media URL" is a raw HTML string like <H1>Foo</H1>
-const U32 PF_RESTRICT_PUSHOBJECT		= 1 << 21;	// Restrict push object to either on agent or on scripts owned by parcel owner
-const U32 PF_DENY_ANONYMOUS				= 1 << 22;	// Deny all non identified/transacted accounts
-// const U32 PF_DENY_IDENTIFIED			= 1 << 23;	// Deny identified accounts
-// const U32 PF_DENY_TRANSACTED			= 1 << 24;	// Deny identified accounts
-const U32 PF_ALLOW_GROUP_SCRIPTS		= 1 << 25;	// Allow scripts owned by group
-const U32 PF_CREATE_GROUP_OBJECTS		= 1 << 26;	// Allow object creation by group members or objects
-const U32 PF_ALLOW_ALL_OBJECT_ENTRY		= 1 << 27;	// Allow all objects to enter a parcel
-const U32 PF_ALLOW_GROUP_OBJECT_ENTRY	= 1 << 28;	// Only allow group (and owner) objects to enter the parcel
-const U32 PF_ALLOW_VOICE_CHAT			= 1 << 29;	// Allow residents to use voice chat on this parcel
+const U32 PF_USE_ACCESS_GROUP   = 1 << 8;
+const U32 PF_USE_ACCESS_LIST    = 1 << 9;
+const U32 PF_USE_BAN_LIST       = 1 << 10;
+const U32 PF_USE_PASS_LIST      = 1 << 11;
+const U32 PF_SHOW_DIRECTORY     = 1 << 12;
+const U32 PF_ALLOW_DEED_TO_GROUP        = 1 << 13;
+const U32 PF_CONTRIBUTE_WITH_DEED       = 1 << 14;
+const U32 PF_SOUND_LOCAL                = 1 << 15;  // Hear sounds in this parcel only
+const U32 PF_SELL_PARCEL_OBJECTS        = 1 << 16;  // Objects on land are included as part of the land when the land is sold
+const U32 PF_ALLOW_PUBLISH              = 1 << 17;  // Allow publishing of parcel information on the web
+const U32 PF_MATURE_PUBLISH             = 1 << 18;  // The information on this parcel is mature
+const U32 PF_URL_WEB_PAGE               = 1 << 19;  // The "media URL" is an HTML page
+const U32 PF_URL_RAW_HTML               = 1 << 20;  // The "media URL" is a raw HTML string like <H1>Foo</H1>
+const U32 PF_RESTRICT_PUSHOBJECT        = 1 << 21;  // Restrict push object to either on agent or on scripts owned by parcel owner
+const U32 PF_DENY_ANONYMOUS             = 1 << 22;  // Deny all non identified/transacted accounts
+// const U32 PF_DENY_IDENTIFIED         = 1 << 23;  // Deny identified accounts
+// const U32 PF_DENY_TRANSACTED         = 1 << 24;  // Deny identified accounts
+const U32 PF_ALLOW_GROUP_SCRIPTS        = 1 << 25;  // Allow scripts owned by group
+const U32 PF_CREATE_GROUP_OBJECTS       = 1 << 26;  // Allow object creation by group members or objects
+const U32 PF_ALLOW_ALL_OBJECT_ENTRY     = 1 << 27;  // Allow all objects to enter a parcel
+const U32 PF_ALLOW_GROUP_OBJECT_ENTRY   = 1 << 28;  // Only allow group (and owner) objects to enter the parcel
+const U32 PF_ALLOW_VOICE_CHAT           = 1 << 29;  // Allow residents to use voice chat on this parcel
 const U32 PF_USE_ESTATE_VOICE_CHAN      = 1 << 30;
-const U32 PF_DENY_AGEUNVERIFIED         = 1 << 31;  // Prevent residents who aren't age-verified 
+const U32 PF_DENY_AGEUNVERIFIED         = 1 << 31;  // Prevent residents who aren't age-verified
 // NOTE: At one point we have used all of the bits.
 // We have deprecated two of them in 1.19.0 which *could* be reused,
 // but only after we are certain there are no simstates using those bits.
 
-//const U32 PF_RESERVED			= 1U << 31;
+//const U32 PF_RESERVED         = 1U << 31;
 
 // If any of these are true the parcel is restricting access in some maner.
 const U32 PF_USE_RESTRICTED_ACCESS = PF_USE_ACCESS_GROUP
-										| PF_USE_ACCESS_LIST
-										| PF_USE_BAN_LIST
-										| PF_USE_PASS_LIST
-										| PF_DENY_ANONYMOUS
-										| PF_DENY_AGEUNVERIFIED;
+                                        | PF_USE_ACCESS_LIST
+                                        | PF_USE_BAN_LIST
+                                        | PF_USE_PASS_LIST
+                                        | PF_DENY_ANONYMOUS
+                                        | PF_DENY_AGEUNVERIFIED;
 const U32 PF_NONE = 0x00000000;
 const U32 PF_ALL  = 0xFFFFFFFF;
 const U32 PF_DEFAULT =  PF_ALLOW_FLY
-						| PF_ALLOW_OTHER_SCRIPTS
-						| PF_ALLOW_GROUP_SCRIPTS
-						| PF_ALLOW_LANDMARK
-						| PF_CREATE_OBJECTS
-						| PF_CREATE_GROUP_OBJECTS
-						| PF_USE_BAN_LIST
-						| PF_ALLOW_ALL_OBJECT_ENTRY
-						| PF_ALLOW_GROUP_OBJECT_ENTRY
+                        | PF_ALLOW_OTHER_SCRIPTS
+                        | PF_ALLOW_GROUP_SCRIPTS
+                        | PF_ALLOW_LANDMARK
+                        | PF_CREATE_OBJECTS
+                        | PF_CREATE_GROUP_OBJECTS
+                        | PF_USE_BAN_LIST
+                        | PF_ALLOW_ALL_OBJECT_ENTRY
+                        | PF_ALLOW_GROUP_OBJECT_ENTRY
                         | PF_ALLOW_VOICE_CHAT
                         | PF_USE_ESTATE_VOICE_CHAN;
 
 // Access list flags
-const U32 AL_ACCESS				= (1 << 0);
-const U32 AL_BAN					= (1 << 1);
-const U32 AL_ALLOW_EXPERIENCE	= (1 << 3);
-const U32 AL_BLOCK_EXPERIENCE	= (1 << 4);
+const U32 AL_ACCESS             = (1 << 0);
+const U32 AL_BAN                    = (1 << 1);
+const U32 AL_ALLOW_EXPERIENCE   = (1 << 3);
+const U32 AL_BLOCK_EXPERIENCE   = (1 << 4);
 //const U32 AL_RENTER  = (1 << 2);
 
 // Block access return values. BA_ALLOWED is the only success case
@@ -107,20 +107,20 @@ const S32 BA_NO_ACCESS_LEVEL = 4;
 const S32 BA_NOT_AGE_VERIFIED = 5;
 
 // ParcelRelease flags
-const U32 PR_NONE		= 0x0;
-const U32 PR_GOD_FORCE	= (1 << 0);
+const U32 PR_NONE       = 0x0;
+const U32 PR_GOD_FORCE  = (1 << 0);
 
 enum EObjectCategory
 {
-	OC_INVALID = -1,
-	OC_NONE = 0,
-	OC_TOTAL = 0,	// yes zero, like OC_NONE
-	OC_OWNER,
-	OC_GROUP,
-	OC_OTHER,
-	OC_SELECTED,
-	OC_TEMP,
-	OC_COUNT
+    OC_INVALID = -1,
+    OC_NONE = 0,
+    OC_TOTAL = 0,   // yes zero, like OC_NONE
+    OC_OWNER,
+    OC_GROUP,
+    OC_OTHER,
+    OC_SELECTED,
+    OC_TEMP,
+    OC_COUNT
 };
 
 const S32 PARCEL_DETAILS_NAME = 0;