diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2010-03-03 12:07:51 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2010-03-03 12:07:51 +0200 |
| commit | 2281b187d370d3663f909128fcf5ec72b08f17dc (patch) | |
| tree | eb65497e2aacc270cf34990fbbdefb398dc78ec9 | |
| parent | d587c77e90947385402c786c045ceaed11f90e1a (diff) | |
fixed Normal Bug EXT-5603 Rightclick on link in long description cause following this link
Cause:
LLViewerWindow called handleMouseUp() instead handleAnyMouseClick(). It caused commit action in LLExpandableTextEditor even after right mouse up event.
Solution:
handleMouseUp() replaced by handleAnyMouseClick()
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f1ec489a20..30f2d2c41b 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -695,22 +695,15 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK { S32 local_x, local_y; top_ctrl->screenPointToLocal( x, y, &local_x, &local_y ); - if (down) + if (top_ctrl->pointInView(local_x, local_y)) { - if (top_ctrl->pointInView(local_x, local_y)) - { - return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down) ; - } - else - { - gFocusMgr.setTopCtrl(NULL); - } + return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down) ; } else { - if (top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask)) + if (down) { - return TRUE; + gFocusMgr.setTopCtrl(NULL); } } } |