diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-05 14:10:00 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-05 14:10:00 +0200 |
| commit | ecb35d25ef68c21fd46220c60931103a44edebaa (patch) | |
| tree | 0be2ddd43b2850f4fa2b5989fec2422e0bf89832 /indra/newview/llnavigationbar.cpp | |
| parent | ecd482d24b63d9658ac71d2bf4155e3ed9175bb9 (diff) | |
| parent | 9ec38e7ef6d51d6d817428075ec3d77a88a736ff (diff) | |
Merge
--HG--
branch : product-engine
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() |