diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-27 13:10:31 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-27 13:10:31 +0200 |
| commit | a5180babefa3f81de5321a9d6d5148ef1bd8e03a (patch) | |
| tree | 46cfc8c64b498d85b2619bcf6669b01c53577601 /indra/newview/llimview.cpp | |
| parent | 88a6cbdaecc06c0ff174d29ca9ff600775edff49 (diff) | |
EXT-3783 “System messages displayed in nearby chat”,
added missing floater_call_info.xml;
avoided recreation of LLCallInfoDialog with the same message;
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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> |