summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2012-04-05 22:56:18 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2012-04-05 22:56:18 +0300
commit2dc032e3e582d39a04c40b7cfb3366424491b491 (patch)
tree57cf77b61463a74117c4e504eb53529f27ba463d /indra/llui
parent177c1f80bc132fdad4e46009b074c0609454332f (diff)
CHUI-78 WIP Added drop-down menus and connected callbacks to the new view/sort/add/remove buttons.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llmenubutton.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp
index 2f5e29c36e..98f7e0540c 100644
--- a/indra/llui/llmenubutton.cpp
+++ b/indra/llui/llmenubutton.cpp
@@ -153,6 +153,11 @@ BOOL LLMenuButton::handleMouseDown(S32 x, S32 y, MASK mask)
void LLMenuButton::toggleMenu()
{
+ if (mValidateSignal && !(*mValidateSignal)(this, LLSD()))
+ {
+ return;
+ }
+
if(mMenuHandle.isDead()) return;
LLToggleableMenu* menu = dynamic_cast<LLToggleableMenu*>(mMenuHandle.get());