svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.

1 files changed, 7 insertions, 6 deletions

diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 6dc9282ba6..ce33f8a379 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -238,11 +238,6 @@ protected:
 	on_disabled_callback	mOnDisabledCallback;
 
 public:
-
-
-	void setMenuCallback(menu_callback callback, void* data) { mCallback = callback;  mUserData = data; };
-	void setEnabledCallback(enabled_callback callback) { mEnabledCallback = callback; };
-
 	// normal constructor
 	LLMenuItemCallGL( const LLString& name,
  					  menu_callback clicked_cb, 
@@ -288,7 +283,13 @@ public:
 	void setEnabledControl(LLString enabled_control, LLView *context);
 	void setVisibleControl(LLString enabled_control, LLView *context);
 
-	virtual void setUserData(void *userdata)	{ mUserData = userdata; }
+	void setMenuCallback(menu_callback callback, void* data) { mCallback = callback;  mUserData = data; };
+	menu_callback getMenuCallback() const { return mCallback; }
+
+	void setEnabledCallback(enabled_callback callback) { mEnabledCallback = callback; };
+
+	void setUserData(void *userdata)	{ mUserData = userdata; }
+	void* getUserData() const { return mUserData; }
 
 	// called to rebuild the draw label
 	virtual void buildDrawLabel( void );