summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-10-30 19:17:53 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-10-30 19:17:53 +0200
commitb2526cde2393ca7d84284b254fb4f37b9e8abb5b (patch)
tree2318b3c35d1b673ba819794c094e6d8e4bad3500 /indra/llui/llmenubutton.cpp
parent2efd4f40af8df78d5b34c1449b1a99e3f570cae5 (diff)
parentaae05b49308d8b5d39a1b1b62f8e6145097043b6 (diff)
merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
-rw-r--r--indra/llui/llmenubutton.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp
index 8dbcd6e229..a657ed039a 100644
--- a/indra/llui/llmenubutton.cpp
+++ b/indra/llui/llmenubutton.cpp
@@ -85,6 +85,8 @@ void LLMenuButton::toggleMenu()
void LLMenuButton::hideMenu()
{
+ if(!mMenu)
+ return;
mMenu->setVisible(FALSE);
}