summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-10-27 18:12:27 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-10-27 18:12:27 +0200
commit42e29558db8e708f1cc59f8564710b4b7f70b7f3 (patch)
tree51d9ff8c36c2fb797178dfcfae6ca409f7ddc03d /indra
parentc377a4b6f42acba8dfe259086985ca9342bb7864 (diff)
EXT-1709 Nearby Chat: Avatar context menu can be triggered on avatar's icon only
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llchathistory.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 8d16f8e1f9..f6cf61a13a 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -122,6 +122,14 @@ public:
LLUICtrl* child = findChild<LLUICtrl>(name);
if(!child)
return false;
+
+ LLView* parent = child->getParent();
+ if(parent!=this)
+ {
+ x-=parent->getRect().mLeft;
+ y-=parent->getRect().mBottom;
+ }
+
S32 local_x = x - child->getRect().mLeft ;
S32 local_y = y - child->getRect().mBottom ;
return child->pointInView(local_x, local_y);