diff options
| author | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
| commit | a91bff4036bbdd0f32722ed573f9f44ab00f00f0 (patch) | |
| tree | a2ee17189b530ace49c886d8a8acc4deb32620b5 /indra/newview/llinspectobject.cpp | |
| parent | 53d5fd1e9bb59868b793f9bef0529cd62ca70126 (diff) | |
| parent | 32bcdd11990e1fa5126a15a2bd22249162c0806a (diff) | |
merge
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; |