Merge main into inventory_favorites

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

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llpersistentnotificationstorage.h b/indra/newview/llpersistentnotificationstorage.h
index 335d85aaf6..72fe2a7975 100644
--- a/indra/newview/llpersistentnotificationstorage.h
+++ b/indra/newview/llpersistentnotificationstorage.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llpersistentnotificationstorage.h
 * @brief  Header file for llpersistentnotificationstorage
 * @author Stinson@lindenlab.com
@@ -45,22 +45,22 @@ class LLSD;
 
 class LLPersistentNotificationStorage : public LLParamSingleton<LLPersistentNotificationStorage>, public LLNotificationStorage
 {
-	LLSINGLETON(LLPersistentNotificationStorage);
-	~LLPersistentNotificationStorage();
-	LOG_CLASS(LLPersistentNotificationStorage);
+    LLSINGLETON(LLPersistentNotificationStorage);
+    ~LLPersistentNotificationStorage();
+    LOG_CLASS(LLPersistentNotificationStorage);
 public:
 
-	void saveNotifications();
-	void loadNotifications();
+    void saveNotifications();
+    void loadNotifications();
     void reset();
 
 protected:
 
 private:
-	void initialize();
+    void initialize();
 
-	bool onPersistentChannelChanged(const LLSD& payload);
-	bool mLoaded;
+    bool onPersistentChannelChanged(const LLSD& payload);
+    bool mLoaded;
 };
 
 #endif // LL_LLPERSISTENTNOTIFICATIONSTORAGE_H