diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-02-05 16:23:13 +0000 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-02-05 16:23:13 +0000 |
| commit | fc9099a0faef9f077b7986651f953998d6b9ac0c (patch) | |
| tree | d192c0e25d250c20faae00519ce3decb0d099340 /indra/llui/lltexteditor.cpp | |
| parent | da44a78e6a899324ca9dad6bae6e0d6fc8b73dcb (diff) | |
| parent | 166ac89de9bcf951103cbf2551a133ebe9e43035 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 3fdb48b3ca..ac5a0376fc 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -242,7 +242,8 @@ LLTextEditor::Params::Params() handle_edit_keys_directly("handle_edit_keys_directly", false), show_line_numbers("show_line_numbers", false), default_color("default_color"), - commit_on_focus_lost("commit_on_focus_lost", false) + commit_on_focus_lost("commit_on_focus_lost", false), + show_context_menu("show_context_menu") {} LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) : @@ -258,7 +259,8 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) : mMouseDownX(0), mMouseDownY(0), mTabsToNextField(p.ignore_tab), - mContextMenu(NULL) + mContextMenu(NULL), + mShowContextMenu(p.show_context_menu) { mDefaultFont = p.font; @@ -720,7 +722,7 @@ BOOL LLTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) } if (!LLTextBase::handleRightMouseDown(x, y, mask)) { - if(getMouseOpaque()) + if(getChowContextMenu()) { showContextMenu(x, y); } |