summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.h
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-05-30 19:58:20 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-05-30 19:58:20 +0300
commit47ec4faeb4dc67f9614e218a75d4957ccf6f794c (patch)
tree11d2e2cb49b0d251c45ebb80a82008d9af3f2fdb /indra/newview/llnearbychatbar.h
parent2286dcb73bfddb9bd4102869005b14241053377d (diff)
CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-container
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
-rw-r--r--indra/newview/llnearbychatbar.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index 8547cf0bce..e714c04498 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -27,26 +27,31 @@
#ifndef LL_LLNEARBYCHATBAR_H
#define LL_LLNEARBYCHATBAR_H
-#include "llfloater.h"
+#include "llimconversation.h"
#include "llcombobox.h"
#include "llgesturemgr.h"
#include "llchat.h"
+#include "llnearbychat.h"
#include "llvoiceclient.h"
#include "lloutputmonitorctrl.h"
#include "llspeakers.h"
-class LLNearbyChatBar : public LLFloater
+class LLNearbyChatBar : public LLIMConversation
{
public:
// constructor for inline chat-bars (e.g. hosted in chat history window)
LLNearbyChatBar(const LLSD& key);
~LLNearbyChatBar() {}
- virtual BOOL postBuild();
+ /*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
static LLNearbyChatBar* getInstance();
+// static LLNearbyChatBar* findInstance();
+ void addToHost();
+
+ void reloadMessages();
LLLineEditor* getChatBox() { return mChatBox; }
virtual void draw();
@@ -83,6 +88,11 @@ protected:
void displaySpeakingIndicator();
+ void onCallButtonClicked();
+
+ // set the enable/disable state for the Call button
+ virtual void enableDisableCallBtn();
+
// Which non-zero channel did we last chat on?
static S32 sLastSpecialChatChannel;