summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-04 16:07:14 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-04 16:07:14 +0000
commit739e3545b32bfa9e15beed0e2ecc44297d9f0950 (patch)
treea206e0d65efe16fbab9df033ecb635ab16a8a427 /indra/llui/lltexteditor.cpp
parent9a15ee8a91a12020b22625873c280837739f946c (diff)
parentc99fb12b3d300705dbf6eb68b1a3f22927d4d221 (diff)
PE merge.
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;
}