diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-26 11:34:41 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-26 11:34:41 -0400 |
| commit | 40689e5b325d2f31c45b377effe6334f0b37c5f2 (patch) | |
| tree | 7f8048ddaf3971ff1dddfd0c2e6b3e8fde61e734 /indra/newview/llinspectobject.cpp | |
| parent | af57ff75dea16ed857c27ebfa288b9881668e9ac (diff) | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
Automated merge up from viewer-development
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; |