diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
| commit | b657516f72f016a918e0ff627105dd380a94394c (patch) | |
| tree | 7d30ace2d3cba42c5f7de1c3dd23748e31b2803f /indra/newview/llinspectobject.cpp | |
| parent | 451d115c1009ded2b2d74efefbe0611c62343eed (diff) | |
| parent | c446062bd3bd3f172b20f22f2086cea962fb7278 (diff) | |
pull beta changes back to 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; |