diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:52:44 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:52:44 -0800 |
commit | 2795661869e3dbbfe1e6becec1d6bb3635eafd3b (patch) | |
tree | c5f090db2907c0904bb6436b894761e82b10349d /indra/llui/lltexteditor.cpp | |
parent | 22bcd0e0eaeda849fbb1a8ecd78eeee7a219c614 (diff) | |
parent | 92f5e24c58f4a33e237c327c5266bb5fab6f9531 (diff) |
Merge from viewer2 trunk.
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rw-r--r-- | indra/llui/lltexteditor.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index f2c3879a6c..06ba0d80e9 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2040,6 +2040,20 @@ void LLTextEditor::showContextMenu(S32 x, S32 y) LLMenuHolderGL::child_registry_t::instance()); } + // Route menu to this class + // previously this was done in ::handleRightMoseDown: + //if(hasTabStop()) + // setFocus(TRUE) - why? weird... + // and then inside setFocus + // .... + // gEditMenuHandler = this; + // .... + // but this didn't work in all cases and just weird... + //why not here? + // (all this was done for EXT-4443) + + gEditMenuHandler = this; + S32 screen_x, screen_y; localPointToScreen(x, y, &screen_x, &screen_y); mContextMenu->show(screen_x, screen_y); |