livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Alexei Arabadji 2010-04-22 15:07:54 +03:00
parent 1f3d4ed06c
commit 29801ac52b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewermessage.cpp
View File

@ -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;