From 31ba05810c641f14e8ab5da8ad2aaf527779f6c1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:37 -0500
Subject: Second Life viewer sources 1.19.1.2

---
 linden/indra/llui/llmenugl.h | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'linden/indra/llui/llmenugl.h')

diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 4e5ac69..cd39006 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -524,8 +524,6 @@ public:
 	static void setKeyboardMode(BOOL mode) { sKeyboardMode = mode; }
 	static BOOL getKeyboardMode() { return sKeyboardMode; }
 
-	static void onFocusLost(LLView* old_focus);
-
 	static class LLMenuHolderGL* sMenuContainer;
 	
 protected:
@@ -666,18 +664,15 @@ public:
 	virtual BOOL append(LLMenuItemGL* item);
 	virtual BOOL appendSeparator( const LLString &separator_name = "separator" );
 
-	// the enabled callback is meant for the submenu. The api works
-	// this way because the menu branch item responsible for the pie
-	// submenu is constructed here.
-	virtual BOOL appendMenu(LLPieMenu *menu,
-							enabled_callback enabled_cb = NULL,
-							void* user_data = NULL );
+	BOOL appendPieMenu(LLPieMenu *menu);
+
 	virtual void arrange( void );
 
 	// Display the menu centered on this point on the screen.
 	void show(S32 x, S32 y, BOOL mouse_down);
 	void hide(BOOL item_selected);
 
+	
 private:
 	LLMenuItemGL *pieItemFromXY(S32 x, S32 y);
 	S32			  pieItemIndexFromXY(S32 x, S32 y);
@@ -763,7 +758,7 @@ public:
 	virtual LLString getWidgetTag() const { return LL_MENU_HOLDER_GL_TAG; }
 
 	virtual BOOL hideMenus();
-	void reshape(S32 width, S32 height, BOOL called_from_parent);
+	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	void setCanHide(BOOL can_hide) { mCanHide = can_hide; }
 
 	// LLView functionality
-- 
cgit v1.1