diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2009-11-04 16:13:47 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2009-11-04 16:13:47 +0200 |
| commit | e634f2f42d5a7165f4cab2910f144144bc7a31d0 (patch) | |
| tree | 195fafdf7328277d2d6c8735ae59b6c1ea143f69 /indra | |
| parent | 14af8485fd3759cda8b5471b0f6171b832d3e1b4 (diff) | |
Fixed problems caused by a160d0dfb897
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 2 |
2 files changed, 9 insertions, 3 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() diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 4175d21639..a289ce3cf7 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -11,7 +11,7 @@ <icon follows="all" image_name="NavBar_BG" - mouse_opaque="true" + mouse_opaque="false" name="bg_icon" scale_image="true" visible="true" |