Merge main into inventory_favorites

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

1 files changed, 21 insertions, 21 deletions

diff --git a/indra/newview/llscriptruntimeperms.h b/indra/newview/llscriptruntimeperms.h
index f692c0ad01..300304c21b 100644
--- a/indra/newview/llscriptruntimeperms.h
+++ b/indra/newview/llscriptruntimeperms.h
@@ -30,11 +30,11 @@
 #include <boost/array.hpp>
 
 typedef struct _script_perm {
-	std::string question;
-	U32 permbit;
-	bool caution;
-	_script_perm(const std::string& q, const U32 b, const bool c) :
-	question(q), permbit(b), caution(c) {}
+    std::string question;
+    U32 permbit;
+    bool caution;
+    _script_perm(const std::string& q, const U32 b, const bool c) :
+    question(q), permbit(b), caution(c) {}
 } script_perm_t;
 
 const U32 NUM_SCRIPT_PERMISSIONS = 18;
@@ -43,22 +43,22 @@ const S32 SCRIPT_PERMISSION_TRIGGER_ANIMATION = 3;
 const S32 SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS = 14;
 
 static const boost::array<script_perm_t, NUM_SCRIPT_PERMISSIONS> SCRIPT_PERMISSIONS = {{
-	_script_perm("ScriptTakeMoney",		(0x1 << 1),  true),
-	_script_perm("ActOnControlInputs",	(0x1 << 2),  false),
-	_script_perm("RemapControlInputs",	(0x1 << 3),  false),
-	_script_perm("AnimateYourAvatar",	(0x1 << 4),  false),
-	_script_perm("AttachToYourAvatar",	(0x1 << 5),  false),
-	_script_perm("ReleaseOwnership",	(0x1 << 6),  false),
-	_script_perm("LinkAndDelink",		(0x1 << 7),  false),
-	_script_perm("AddAndRemoveJoints",	(0x1 << 8),  false),
-	_script_perm("ChangePermissions",	(0x1 << 9),  false),
-	_script_perm("TrackYourCamera",		(0x1 << 10), false),
-	_script_perm("ControlYourCamera",	(0x1 << 11), false),
-	_script_perm("TeleportYourAgent",	(0x1 << 12), false),
-	_script_perm("JoinAnExperience",	(0x1 << 13), false),
-	_script_perm("SilentlyManageEstateAccess", (0x1 << 14), false),
-	_script_perm("OverrideYourAnimations", (0x1 << 15), false),
-	_script_perm("ScriptReturnObjects",	(0x1 << 16), false),
+    _script_perm("ScriptTakeMoney",     (0x1 << 1),  true),
+    _script_perm("ActOnControlInputs",  (0x1 << 2),  false),
+    _script_perm("RemapControlInputs",  (0x1 << 3),  false),
+    _script_perm("AnimateYourAvatar",   (0x1 << 4),  false),
+    _script_perm("AttachToYourAvatar",  (0x1 << 5),  false),
+    _script_perm("ReleaseOwnership",    (0x1 << 6),  false),
+    _script_perm("LinkAndDelink",       (0x1 << 7),  false),
+    _script_perm("AddAndRemoveJoints",  (0x1 << 8),  false),
+    _script_perm("ChangePermissions",   (0x1 << 9),  false),
+    _script_perm("TrackYourCamera",     (0x1 << 10), false),
+    _script_perm("ControlYourCamera",   (0x1 << 11), false),
+    _script_perm("TeleportYourAgent",   (0x1 << 12), false),
+    _script_perm("JoinAnExperience",    (0x1 << 13), false),
+    _script_perm("SilentlyManageEstateAccess", (0x1 << 14), false),
+    _script_perm("OverrideYourAnimations", (0x1 << 15), false),
+    _script_perm("ScriptReturnObjects", (0x1 << 16), false),
     _script_perm("ForceSitAvatar",      (0x1 << 17), false),
     _script_perm("ChangeEnvSettings",   (0x1 << 18), false)
     } };