Merge main into inventory_favorites

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

1 files changed, 41 insertions, 41 deletions

diff --git a/indra/llui/llnotificationsutil.cpp b/indra/llui/llnotificationsutil.cpp
index cc791c26d1..c1cad431c5 100644
--- a/indra/llui/llnotificationsutil.cpp
+++ b/indra/llui/llnotificationsutil.cpp
@@ -4,21 +4,21 @@
  * $LicenseInfo:firstyear=2008&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$
  */
@@ -28,68 +28,68 @@
 
 #include "llnotifications.h"
 #include "llsd.h"
-#include "llxmlnode.h"	// apparently needed to call LLNotifications::instance()
+#include "llxmlnode.h"  // apparently needed to call LLNotifications::instance()
 
 LLNotificationPtr LLNotificationsUtil::add(const std::string& name)
 {
-	LLNotification::Params::Functor functor_p;
-	functor_p.name = name;
-	return LLNotifications::instance().add(
-		LLNotification::Params().name(name).substitutions(LLSD()).payload(LLSD()).functor(functor_p));	
+    LLNotification::Params::Functor functor_p;
+    functor_p.name = name;
+    return LLNotifications::instance().add(
+        LLNotification::Params().name(name).substitutions(LLSD()).payload(LLSD()).functor(functor_p));
 }
 
-LLNotificationPtr LLNotificationsUtil::add(const std::string& name, 
-					  const LLSD& substitutions)
+LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
+                      const LLSD& substitutions)
 {
-	LLNotification::Params::Functor functor_p;
-	functor_p.name = name;
-	return LLNotifications::instance().add(
-		LLNotification::Params().name(name).substitutions(substitutions).payload(LLSD()).functor(functor_p));	
+    LLNotification::Params::Functor functor_p;
+    functor_p.name = name;
+    return LLNotifications::instance().add(
+        LLNotification::Params().name(name).substitutions(substitutions).payload(LLSD()).functor(functor_p));
 }
 
-LLNotificationPtr LLNotificationsUtil::add(const std::string& name, 
-					  const LLSD& substitutions, 
-					  const LLSD& payload)
+LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
+                      const LLSD& substitutions,
+                      const LLSD& payload)
 {
-	LLNotification::Params::Functor functor_p;
-	functor_p.name = name;
-	return LLNotifications::instance().add(
-		LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));	
+    LLNotification::Params::Functor functor_p;
+    functor_p.name = name;
+    return LLNotifications::instance().add(
+        LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));
 }
 
-LLNotificationPtr LLNotificationsUtil::add(const std::string& name, 
-					  const LLSD& substitutions, 
-					  const LLSD& payload, 
-					  const std::string& functor_name)
+LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
+                      const LLSD& substitutions,
+                      const LLSD& payload,
+                      const std::string& functor_name)
 {
-	LLNotification::Params::Functor functor_p;
-	functor_p.name = functor_name;
-	return LLNotifications::instance().add(
-		LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));	
+    LLNotification::Params::Functor functor_p;
+    functor_p.name = functor_name;
+    return LLNotifications::instance().add(
+        LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));
 }
 
-LLNotificationPtr LLNotificationsUtil::add(const std::string& name, 
-					  const LLSD& substitutions, 
-					  const LLSD& payload, 
-					  boost::function<void (const LLSD&, const LLSD&)> functor)
+LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
+                      const LLSD& substitutions,
+                      const LLSD& payload,
+                      boost::function<void (const LLSD&, const LLSD&)> functor)
 {
-	LLNotification::Params::Functor functor_p;
-	functor_p.function = functor;
-	return LLNotifications::instance().add(
-		LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));	
+    LLNotification::Params::Functor functor_p;
+    functor_p.function = functor;
+    return LLNotifications::instance().add(
+        LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));
 }
 
 S32 LLNotificationsUtil::getSelectedOption(const LLSD& notification, const LLSD& response)
 {
-	return LLNotification::getSelectedOption(notification, response);
+    return LLNotification::getSelectedOption(notification, response);
 }
 
 void LLNotificationsUtil::cancel(LLNotificationPtr pNotif)
 {
-	LLNotifications::instance().cancel(pNotif);
+    LLNotifications::instance().cancel(pNotif);
 }
 
 LLNotificationPtr LLNotificationsUtil::find(LLUUID uuid)
 {
-	return LLNotifications::instance().find(uuid);
+    return LLNotifications::instance().find(uuid);
 }