From d8a7427c2e6baab711d62e719449375993980904 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Sat, 18 Feb 2012 08:28:17 +0000 Subject: Re-added eventhost nearyby host listener --- indra/newview/llnearbychatbar.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llnearbychatbar.h') diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index baf12a06ea..bb07c60154 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -35,6 +35,8 @@ #include "lloutputmonitorctrl.h" #include "llspeakers.h" +class LLNearbyChatBarListener; + class LLNearbyChatBar : public LLFloater { public: @@ -92,6 +94,8 @@ protected: LLLocalSpeakerMgr* mSpeakerMgr; S32 mExpandedHeight; + + boost::shared_ptr mListener; }; #endif -- cgit v1.2.3 From b0ba9364fce6ae3ff132f63729e3d5f9b100afe9 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 21 Mar 2012 17:50:34 +0200 Subject: MAINT-518 FIXED Sometimes nearby chat expand button failed to work. Made the nearby chat expand/collapse logic work regardless of the previous/saved state. --- indra/newview/llnearbychatbar.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llnearbychatbar.h') diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index baf12a06ea..0a320942dd 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -37,6 +37,8 @@ class LLNearbyChatBar : public LLFloater { + LOG_CLASS(LLNearbyChatBar); + public: // constructor for inline chat-bars (e.g. hosted in chat history window) LLNearbyChatBar(const LLSD& key); @@ -76,6 +78,7 @@ protected: /* virtual */ bool applyRectControl(); + void showNearbyChatPanel(bool show); void onToggleNearbyChatPanel(); static LLWString stripChannelNumber(const LLWString &mesg, S32* channel); -- cgit v1.2.3