sunshine-external merge WIP

1 files changed, 3 insertions, 5 deletions

diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 6ac4a98806..b0e8553a49 100755
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -92,6 +92,7 @@
 #include "llevents.h"
 #include "llfunctorregistry.h"
 #include "llinitparam.h"
+#include "llinstancetracker.h"
 #include "llmortician.h"
 #include "llnotificationptr.h"
 #include "llpointer.h"
@@ -848,7 +849,7 @@ public:
     Iterator begin();
     Iterator end();
 	size_t size();
-
+	
 	std::string summarize();
 
 private:
@@ -1067,15 +1068,13 @@ class LLPersistentNotificationChannel : public LLNotificationChannel
 public:
 	LLPersistentNotificationChannel() 
 		:	LLNotificationChannel("Persistent", "Visible", &notificationFilter)
-	{
-	}
+	{}
 
 	typedef std::vector<LLNotificationPtr> history_list_t;
 	history_list_t::iterator beginHistory() { sortHistory(); return mHistory.begin(); }
 	history_list_t::iterator endHistory() { return mHistory.end(); }
 
 private:
-
 	struct sortByTime
 	{
 		S32 operator ()(const LLNotificationPtr& a, const LLNotificationPtr& b)
@@ -1089,7 +1088,6 @@ private:
 		std::sort(mHistory.begin(), mHistory.end(), sortByTime());
 	}
 
-
 	// The channel gets all persistent notifications except those that have been canceled
 	static bool notificationFilter(LLNotificationPtr pNotification)
 	{