From 51a39b5ac6465238178363f3ec3143dae4f73919 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Thu, 14 Jun 2012 20:00:41 +0300 Subject: CHUI-199 WIP Modified the nearby chat for using floater_im_session.xml; merging LLNearbyChatBar with LLNearbyChat; clean up code; supressed a double creation of LLNearbyChat --- indra/newview/llnearbychat.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/llnearbychat.cpp') diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index cd181ce865..fbaf451412 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -408,8 +408,6 @@ BOOL LLNearbyChat::tick() // via LLMortician::updateClass(), to avoid calling dead instances. See LLFloater::destroy(). if (isDead()) return false; - BOOL parents_retcode = LLIMConversation::tick(); - displaySpeakingIndicator(); updateCallBtnState(LLVoiceClient::getInstance()->getUserPTTState()); @@ -421,7 +419,7 @@ BOOL LLNearbyChat::tick() setTransparencyType(hasFocus() ? TT_ACTIVE : TT_INACTIVE); } - return parents_retcode; + return LLIMConversation::tick(); } std::string LLNearbyChat::getCurrentChat() -- cgit v1.2.3