summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
-rw-r--r--indra/newview/llnearbychat.cpp4
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()