summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-01-29 17:04:17 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-01-29 17:04:17 +0200
commit015453dbc7ad1494d984a46973a7d41eb5c6ac2a (patch)
tree4e0f0eebaee0554483b3247fcf755e3193c8daf0 /indra/newview
parentd643a16c384332de535e6b6ec93f3437604a66e3 (diff)
fixed EXT-4736 There's an ability to block system notifications from nearby chat
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llchathistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index f1e7e622b3..8cfcca31ce 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -310,7 +310,7 @@ protected:
showSystemContextMenu(x,y);
if(mSourceType == CHAT_SOURCE_AGENT)
showAvatarContextMenu(x,y);
- if(mSourceType == CHAT_SOURCE_OBJECT)
+ if(mSourceType == CHAT_SOURCE_OBJECT && SYSTEM_FROM != mFrom)
showObjectContextMenu(x,y);
}