summaryrefslogtreecommitdiff
path: root/indra/llui/llmenubutton.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-02 09:54:52 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-02 09:54:52 -0800
commit9ed8b5299f2e5a8a912649e0e6aecaf89b034408 (patch)
treee7c9ecc91fbbef0c26fd352f2743ac050d8f889e /indra/llui/llmenubutton.cpp
parent55731ee318e6e3c2e9998c6347cbd9d3635115c4 (diff)
parent3783852444825edf420e6109927df21fd004c3e7 (diff)
Merge from remote repo
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);
}