CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index d3569694f1..9195ea2344 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -341,6 +341,8 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string&
 
 void LLIMModel::LLIMSession::onAdHocNameCache(const LLAvatarName& av_name)
 {
+	mAvatarNameCacheConnection.disconnect();
+
 	if (!av_name.isValidName())
 	{
 		S32 separator_index = mName.rfind(" ");
@@ -2178,6 +2180,7 @@ void LLIncomingCallDialog::onAvatarNameCache(const LLUUID& agent_id,
 											 const LLAvatarName& av_name,
 											 const std::string& call_type)
 {
+	mAvatarNameCacheConnection.disconnect();
 	std::string title = av_name.getCompleteName();
 	setCallerName(title, av_name.getCompleteName(), call_type);
 }