diff options
author | Seth ProductEngine <slitovchuk@productengine.com> | 2010-10-22 02:08:26 +0300 |
---|---|---|
committer | Seth ProductEngine <slitovchuk@productengine.com> | 2010-10-22 02:08:26 +0300 |
commit | 54da19fdcfa3edadbc58a1f55a3503082e66f16e (patch) | |
tree | 225395450861ee317548a5c96c44b8656092ab38 /indra/newview/llinspectobject.cpp | |
parent | de6f7e19c44d267d3224c56941c2ab27677c406f (diff) |
STORM-426 FIXED Menu button no longer looked pressed while its menu is displayed by another control.
- LLMenuGL in menu button replaced by LLToggleableMenu that handles visibility change upon clicks inside specific button rect.
- Added visibility change signal to LLToggleableMenu to update menu button pressed state.
- Added using menu handle in LLMenuButton.
Diffstat (limited to 'indra/newview/llinspectobject.cpp')
-rw-r--r-- | indra/newview/llinspectobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp index 532ffca4be..ee076f68ea 100644 --- a/indra/newview/llinspectobject.cpp +++ b/indra/newview/llinspectobject.cpp @@ -47,6 +47,7 @@ #include "llsafehandle.h" #include "llsidetray.h" #include "lltextbox.h" // for description truncation +#include "lltoggleablemenu.h" #include "lltrans.h" #include "llui.h" // positionViewNearMouse() #include "lluictrl.h" @@ -568,7 +569,7 @@ void LLInspectObject::updateSecureBrowsing() // if the gear menu is not open void LLInspectObject::onMouseLeave(S32 x, S32 y, MASK mask) { - LLMenuGL* gear_menu = getChild<LLMenuButton>("gear_btn")->getMenu(); + LLToggleableMenu* gear_menu = getChild<LLMenuButton>("gear_btn")->getMenu(); if ( gear_menu && gear_menu->getVisible() ) { return; |