diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
| commit | 0f00eef21798520bcfe27ae03b3f1b2ae938ff13 (patch) | |
| tree | 81c5b33e296d316a10a76c5a9e4cd09790aaa029 /indra/llui/llmenugl.cpp | |
| parent | ef0eb8dbcf3980a057ad0864efa1c8e1575a8428 (diff) | |
svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 906b134d2b..8ec5656e18 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -1239,6 +1239,7 @@ BOOL LLMenuItemBranchGL::handleMouseUp(S32 x, S32 y, MASK mask) doIt(); make_ui_sound("UISndClickRelease"); + return TRUE; } return FALSE; } @@ -1550,7 +1551,7 @@ public: // LLView functionality virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask ); - virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask ) {return FALSE; } + virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask ); virtual void draw( void ); virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent); @@ -1674,6 +1675,11 @@ BOOL LLMenuItemBranchDownGL::handleMouseDown( S32 x, S32 y, MASK mask ) return TRUE; } +BOOL LLMenuItemBranchDownGL::handleMouseUp( S32 x, S32 y, MASK mask ) +{ + return TRUE; +} + BOOL LLMenuItemBranchDownGL::handleAcceleratorKey(KEY key, MASK mask) { |