diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-25 13:43:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-25 13:43:22 -0700 |
| commit | 3116e0d3525ba5cef9923a156bcbf405201b70c0 (patch) | |
| tree | 505f3a97e2c3e412bdb4a3111c1c3f087e214f25 /indra/newview/llinspectobject.cpp | |
| parent | 2a5902f75f44f5989fc7ac3f4ac5e421778a4807 (diff) | |
| parent | 54da19fdcfa3edadbc58a1f55a3503082e66f16e (diff) | |
STORM-426 : merge with 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; |