diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-04 19:15:12 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-04 19:15:12 -0800 |
| commit | af401ac6dc463db477210b0ff100014fbeb50a9a (patch) | |
| tree | 6bb39558de0208fc05af074fb5efe8498a493c4a /indra/newview/llnavigationbar.cpp | |
| parent | 4656c5671cfe523e351b5c91ae45d5026fb69e04 (diff) | |
| parent | 15df55ecafd2f6d72f25988401ddb7ed58030b79 (diff) | |
Merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index b35fd6134b..1312949f54 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -274,8 +274,14 @@ void LLNavigationBar::draw() BOOL LLNavigationBar::handleRightMouseDown(S32 x, S32 y, MASK mask) { - show_navbar_context_menu(this,x,y); - return TRUE; + BOOL handled = childrenHandleRightMouseDown( x, y, mask) != NULL; + if(!handled && !gMenuHolder->hasVisibleMenu()) + { + show_navbar_context_menu(this,x,y); + handled = true; + } + + return handled; } void LLNavigationBar::onBackButtonClicked() |