diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-22 15:07:54 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-22 15:07:54 +0300 |
| commit | 29801ac52b3df201535c8e96b4cfc80e38a619f8 (patch) | |
| tree | 244b732595215f1de726306430bb6b4339996f03 /indra | |
| parent | 1f3d4ed06c1ffdfb1a24d9144ab801e196c87fc4 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<LLNearbyChat>("nearby_chat", LLSD()); - if(nearby_chat) + if(SYSTEM_FROM != name && nearby_chat) { LLSD args; args["owner_id"] = from_id; |