merge late 3.0.1 beta candidate fixes

1 files changed, 15 insertions, 6 deletions

diff --git a/indra/llui/llmenubutton.h b/indra/llui/llmenubutton.h
index 7b657595da..e2396e7fb2 100644
--- a/indra/llui/llmenubutton.h
+++ b/indra/llui/llmenubutton.h
@@ -35,21 +35,30 @@ class LLMenuButton
 : public LLButton
 {
 public:
+	typedef enum e_menu_position
+	{
+		MP_TOP_LEFT,
+		MP_TOP_RIGHT,
+		MP_BOTTOM_LEFT
+	} EMenuPosition;
+
+	struct MenuPositions
+		:	public LLInitParam::TypeValuesHelper<EMenuPosition, MenuPositions>
+	{
+		static void declareValues();
+	};
+
 	struct Params 
 	:	public LLInitParam::Block<Params, LLButton::Params>
 	{
 		// filename for it's toggleable menu
 		Optional<std::string>	menu_filename;
+		Optional<EMenuPosition>	position;
 	
 		Params();
 	};
 
-	typedef enum e_menu_position
-	{
-		MP_TOP_LEFT,
-		MP_TOP_RIGHT,
-		MP_BOTTOM_LEFT
-	} EMenuPosition;
+
 	
 	boost::signals2::connection setMouseDownCallback( const mouse_signal_t::slot_type& cb );