From 29801ac52b3df201535c8e96b4cfc80e38a619f8 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Thu, 22 Apr 2010 15:07:54 +0300 Subject: fixed EXT-6972 Object return notification is displayed as notification and nearby chat toasts simultaneously Made condition of logging to nearby chat more stronger to avoid logging "object return" messages. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/300/ --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 43c3042c65..d75e55f259 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2482,7 +2482,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // Note: lie to Nearby Chat, pretending that this is NOT an IM, because // IMs from obejcts don't open IM sessions. LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance("nearby_chat", LLSD()); - if(nearby_chat) + if(SYSTEM_FROM != name && nearby_chat) { LLSD args; args["owner_id"] = from_id; -- cgit v1.2.3