Merged in my latest changes including switching LLAPRSockStream to be fully non-blocking (and thus not horribly inefficient) and a bunch of new event listener implementations.

2 files changed, 22 insertions, 22 deletions

diff --git a/indra/llui/llnotificationslistener.cpp b/indra/llui/llnotificationslistener.cpp
index d2d83bd6e3..d6e552ca5c 100644
--- a/indra/llui/llnotificationslistener.cpp
+++ b/indra/llui/llnotificationslistener.cpp
@@ -14,12 +14,12 @@
 #include "llnotificationslistener.h"
 
 #include "llnotifications.h"
-

-LLNotificationsListener::LLNotificationsListener(LLNotifications & notifications) :

-    LLDispatchListener("LLNotifications", "op"),

-    mNotifications(notifications)

-{

-    add("requestAdd", &LLNotificationsListener::requestAdd);

+
+LLNotificationsListener::LLNotificationsListener(LLNotifications & notifications) :
+    LLDispatchListener("LLNotifications", "op"),
+    mNotifications(notifications)
+{
+    add("requestAdd", &LLNotificationsListener::requestAdd);
 }
 
 void LLNotificationsListener::requestAdd(const LLSD& event_data) const
diff --git a/indra/llui/llnotificationslistener.h b/indra/llui/llnotificationslistener.h
index a163b00550..3576cacbdb 100644
--- a/indra/llui/llnotificationslistener.h
+++ b/indra/llui/llnotificationslistener.h
@@ -13,19 +13,19 @@
 #define LL_LLNOTIFICATIONSLISTENER_H
 
 #include "lleventdispatcher.h"
-

-class LLNotifications;

-class LLSD;

-

-class LLNotificationsListener : public LLDispatchListener

-{

-public:

-    LLNotificationsListener(LLNotifications & notifications);

-

-    void requestAdd(LLSD const & event_data) const;

-

-private:

-    LLNotifications & mNotifications;

-};

-

-#endif // LL_LLNOTIFICATIONSLISTENER_H

+
+class LLNotifications;
+class LLSD;
+
+class LLNotificationsListener : public LLDispatchListener
+{
+public:
+    LLNotificationsListener(LLNotifications & notifications);
+
+    void requestAdd(LLSD const & event_data) const;
+
+private:
+    LLNotifications & mNotifications;
+};
+
+#endif // LL_LLNOTIFICATIONSLISTENER_H