summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-04 17:12:36 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-04 17:12:36 +0200
commit29a5e29ddb72ae141345753db269d3f2dbfd195c (patch)
tree347dc7d19999ab3afbb1941d0c6d8a059e312351 /indra/llui/lltexteditor.cpp
parent41c6155f13dbb9ed8bc136bc3350bc8fc87e7f56 (diff)
parente918089f592da2094e6b23a146e0e30b711562dc (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rw-r--r--indra/llui/lltexteditor.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 62aeb50011..3fdb48b3ca 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -720,7 +720,10 @@ BOOL LLTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
}
if (!LLTextBase::handleRightMouseDown(x, y, mask))
{
- showContextMenu(x, y);
+ if(getMouseOpaque())
+ {
+ showContextMenu(x, y);
+ }
}
return TRUE;
}