summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychathandler.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-01 07:21:09 -0400
committerOz Linden <oz@lindenlab.com>2011-06-01 07:21:09 -0400
commite9501b855b32189f1bf627853487a443e6d9daf8 (patch)
tree3fead613d37b33f51f99a09c8a1fd8ab4f6b3353 /indra/newview/llnearbychathandler.h
parent6c9b45f4d6776e87cb1d70df0c456d29c3eb0ed7 (diff)
parentd6f7526abf223b671b4e17be48dcc1e46e8f2fd8 (diff)
merge changes for storm-1299
Diffstat (limited to 'indra/newview/llnearbychathandler.h')
-rw-r--r--indra/newview/llnearbychathandler.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llnearbychathandler.h b/indra/newview/llnearbychathandler.h
index ec1f29cdfc..b0e4f62d51 100644
--- a/indra/newview/llnearbychathandler.h
+++ b/indra/newview/llnearbychathandler.h
@@ -29,6 +29,8 @@
#include "llnotificationhandler.h"
+class LLEventPump;
+
//add LLNearbyChatHandler to LLNotificationsUI namespace
namespace LLNotificationsUI{
@@ -44,6 +46,8 @@ public:
protected:
virtual void onDeleteToast(LLToast* toast);
virtual void initChannel();
+
+ static boost::scoped_ptr<LLEventPump> sChatWatcher;
};
}