Merge main into inventory_favorites

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

1 files changed, 57 insertions, 57 deletions

diff --git a/indra/llui/llnotificationvisibilityrule.h b/indra/llui/llnotificationvisibilityrule.h
index 78788a275c..064b3b148e 100644
--- a/indra/llui/llnotificationvisibilityrule.h
+++ b/indra/llui/llnotificationvisibilityrule.h
@@ -1,26 +1,26 @@
 /**
 * @file llnotificationvisibility.h
-* @brief Rules for 
+* @brief Rules for
 * @author Monroe
 *
 * $LicenseInfo:firstyear=2010&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$
 */
@@ -33,71 +33,71 @@
 
 
 
-// This is the class of object read from the XML file (notification_visibility.xml, 
+// This is the class of object read from the XML file (notification_visibility.xml,
 // from the appropriate local language directory).
 struct LLNotificationVisibilityRule
 {
-	struct Filter : public LLInitParam::Block<Filter>
-	{
-		Optional<std::string>	type,
-								tag,
-								name;
-
-		Filter()
-		:	type("type"),
-			tag("tag"),
-			name("name")
-		{}
-	};
-
-	struct Respond : public LLInitParam::Block<Respond, Filter>
-	{
-		Mandatory<std::string> response;
-
-		Respond()
-		:	response("response")
-		{}
-	};
-
-	struct Rule : public LLInitParam::ChoiceBlock<Rule>
-	{
-		Alternative<Filter>		show;
-		Alternative<Filter>		hide;
-		Alternative<Respond>	respond;
-
-		Rule()
-		:	show("show"),
-			hide("hide"),
-			respond("respond")
-		{}
-	};
-
-	struct Rules : public LLInitParam::Block<Rules>
-	{
-		Multiple<Rule>	rules;
-
-		Rules()
-		:	rules("")
-		{}
-	};
-
-	LLNotificationVisibilityRule(const Rule& p);
-	
+    struct Filter : public LLInitParam::Block<Filter>
+    {
+        Optional<std::string>   type,
+                                tag,
+                                name;
+
+        Filter()
+        :   type("type"),
+            tag("tag"),
+            name("name")
+        {}
+    };
+
+    struct Respond : public LLInitParam::Block<Respond, Filter>
+    {
+        Mandatory<std::string> response;
+
+        Respond()
+        :   response("response")
+        {}
+    };
+
+    struct Rule : public LLInitParam::ChoiceBlock<Rule>
+    {
+        Alternative<Filter>     show;
+        Alternative<Filter>     hide;
+        Alternative<Respond>    respond;
+
+        Rule()
+        :   show("show"),
+            hide("hide"),
+            respond("respond")
+        {}
+    };
+
+    struct Rules : public LLInitParam::Block<Rules>
+    {
+        Multiple<Rule>  rules;
+
+        Rules()
+        :   rules("")
+        {}
+    };
+
+    LLNotificationVisibilityRule(const Rule& p);
+
     // If true, this rule makes matching notifications visible.  Otherwise, it makes them invisible.
     bool mVisible;
 
     // Which response to give when making a notification invisible.  An empty string means the notification should be cancelled instead of responded to.
-	std::string mResponse;
+    std::string mResponse;
 
     // String to match against the notification's "type".  An empty string matches all notifications.
     std::string mType;
-	
+
     // String to match against the notification's tag(s).  An empty string matches all notifications.
-	std::string mTag;
+    std::string mTag;
 
     // String to match against the notification's name.  An empty string matches all notifications.
-	std::string mName;
-	
+    std::string mName;
+
 };
 
 #endif //LL_LLNOTIFICATION_VISIBILITY_RULE_H