merge changes for 3.5.0-beta3 (chui)

1 files changed, 50 insertions, 0 deletions

diff --git a/indra/newview/llfloaterimnearbychatlistener.h b/indra/newview/llfloaterimnearbychatlistener.h
new file mode 100644
index 0000000000..1470a6dc1e
--- /dev/null
+++ b/indra/newview/llfloaterimnearbychatlistener.h
@@ -0,0 +1,50 @@
+/**
+ * @file   llfloaterimnearbychatlistener.h
+ * @author Dave Simmons
+ * @date   2011-03-15
+ * @brief  Class definition for LLFloaterIMNearbyChatListener.
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, 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$
+ */
+
+
+#ifndef LL_LLFLOATERIMNEARBYCHATLISTENER_H
+#define LL_LLFLOATERIMNEARBYCHATLISTENER_H
+
+#include "lleventapi.h"
+
+class LLSD;
+class LLFloaterIMNearbyChat;
+
+class LLFloaterIMNearbyChatListener : public LLEventAPI
+{
+public:
+	LLFloaterIMNearbyChatListener(LLFloaterIMNearbyChat & chatbar);
+
+private:
+    void sendChat(LLSD const & chat_data) const;
+
+	LLFloaterIMNearbyChat & mChatbar;
+};
+
+#endif // LL_LLFLOATERIMNEARBYCHATLISTENER_H
+