From a5180babefa3f81de5321a9d6d5148ef1bd8e03a Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 27 Jan 2010 13:10:31 +0200
Subject: =?UTF-8?q?EXT-3783=20=E2=80=9CSystem=20messages=20displayed=20in?=
 =?UTF-8?q?=20nearby=20chat=E2=80=9D,=20added=20missing=20floater=5Fcall?=
 =?UTF-8?q?=5Finfo.xml;=20avoided=20recreation=20of=20LLCallInfoDialog=20w?=
 =?UTF-8?q?ith=20the=20same=20message;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index f90a51c3f3..6ac7378c58 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -3239,7 +3239,13 @@ void LLCallInfoDialog::show(const std::string& status_name, const LLSD& args)
 
 	LLSD payload;
 	payload["msg"] = message;
-	LLFloaterReg::showInstance("call_info", payload);
+	LLFloater* inst = LLFloaterReg::findInstance("call_info");
+
+	// avoid recreate instance with the same message
+	if (inst == NULL || message.getString() != inst->getChild<LLTextBox>("msg")->getValue())
+	{
+		LLFloaterReg::showInstance("call_info", payload);
+	}
 }
 
 LLHTTPRegistration<LLViewerChatterBoxSessionStartReply>
-- 
cgit v1.2.3