summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-10-30 09:58:41 -0400
committerJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-10-30 09:58:41 -0400
commitaae05b49308d8b5d39a1b1b62f8e6145097043b6 (patch)
tree6f6ede75171952788ddd1037b58cc67340eaec74 /indra/llui/llmenubutton.cpp
parent283b862814996dad24ce1e896122465fede118a1 (diff)
parent4dd6626c800988f70925d7687f0a4b7bbe20694b (diff)
Merge commit.
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);
}