EXP-1028 FIX Move mode switching to logged in UI

added mode switching button to status bars for advanced and basic mode, changed
login combo box to use menu instead

2 files changed, 24 insertions, 8 deletions

diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp
index eed0085273..50d59f79f4 100644
--- a/indra/llui/llmenubutton.cpp
+++ b/indra/llui/llmenubutton.cpp
@@ -35,9 +35,16 @@
 
 static LLDefaultChildRegistry::Register<LLMenuButton> r("menu_button");
 
+void LLMenuButton::MenuPositions::declareValues()
+{
+	declare("topleft", MP_TOP_LEFT);
+	declare("topright", MP_TOP_RIGHT);
+	declare("bottomleft", MP_BOTTOM_LEFT);
+}
 
 LLMenuButton::Params::Params()
-:	menu_filename("menu_filename")
+:	menu_filename("menu_filename"),
+	position("position", MP_BOTTOM_LEFT)
 {
 }
 
@@ -45,7 +52,7 @@ LLMenuButton::Params::Params()
 LLMenuButton::LLMenuButton(const LLMenuButton::Params& p)
 :	LLButton(p),
 	mIsMenuShown(false),
-	mMenuPosition(MP_BOTTOM_LEFT)
+	mMenuPosition(p.position)
 {
 	std::string menu_filename = p.menu_filename;
 
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 );