From c4cfd1df44c1a6784f7780b03267203400804c48 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 28 Sep 2010 14:21:54 -0700
Subject: don't show empty context menus

---
 indra/llui/llmenugl.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llui/llmenugl.cpp')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index b1f4b362d5..87f01cf44f 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3803,6 +3803,11 @@ void LLContextMenu::setVisible(BOOL visible)
 // Takes cursor position in screen space?
 void LLContextMenu::show(S32 x, S32 y)
 {
+	if (getChildList()->empty())
+	{
+		// nothing to show, so abort
+		return;
+	}
 	// Save click point for detecting cursor moves before mouse-up.
 	// Must be in local coords to compare with mouseUp events.
 	// If the mouse doesn't move, the menu will stay open ala the Mac.
-- 
cgit v1.2.3