diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-14 20:00:41 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-14 20:00:41 +0300 |
| commit | 51a39b5ac6465238178363f3ec3143dae4f73919 (patch) | |
| tree | e4b7502b0a4b8ccb7c498e0c22f4c295e8315697 /indra/newview/llnearbychat.cpp | |
| parent | 569146f27c7350ca2245f1fa7bc4cb9c16a428ea (diff) | |
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
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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() |