Merge

--HG--
branch : product-engine

indra/llui/lltabcontainer.cpp

@@ -212,7 +212,8 @@ LLTabContainer::Params::Params()
 	middle_tab("middle_tab"),
 	last_tab("last_tab"),
 	use_custom_icon_ctrl("use_custom_icon_ctrl", false),
-	tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0)
+	tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0),
+	use_ellipses("use_ellipses")
 {
 	name(std::string("tab_container"));
 	mouse_opaque = false;
@@ -249,7 +250,8 @@ LLTabContainer::LLTabContainer(const LLTabContainer::Params& p)
 	mMiddleTabParams(p.middle_tab),
 	mLastTabParams(p.last_tab),
 	mCustomIconCtrlUsed(p.use_custom_icon_ctrl),
-	mTabIconCtrlPad(p.tab_icon_ctrl_pad)
+	mTabIconCtrlPad(p.tab_icon_ctrl_pad),
+	mUseTabEllipses(p.use_ellipses)
 {
 	static LLUICachedControl<S32> tabcntr_vert_tab_min_width ("UITabCntrVertTabMinWidth", 0);
 
@@ -1485,8 +1487,8 @@ BOOL LLTabContainer::setTab(S32 which)
 		{
 			LLTabTuple* tuple = *iter;
 			BOOL is_selected = ( tuple == selected_tuple );
-			tuple->mButton->setUseEllipses(TRUE);
-			tuple->mButton->setHAlign(LLFontGL::LEFT);
+			tuple->mButton->setUseEllipses(mUseTabEllipses);
+			tuple->mButton->setHAlign(mFontHalign);
 			tuple->mTabPanel->setVisible( is_selected );
 // 			tuple->mTabPanel->setFocus(is_selected); // not clear that we want to do this here.
 			tuple->mButton->setToggleState( is_selected );

indra/llui/lltabcontainer.h

@@ -92,6 +92,16 @@ public:
 											middle_tab,
 											last_tab;
 
+		/**
+		 * Tab label horizontal alignment
+		 */
+		Optional<LLFontGL::HAlign>			font_halign;
+
+		/**
+		 * Tab label ellipses
+		 */
+		Optional<bool>						use_ellipses;
+
 		/**
 		 * Use LLCustomButtonIconCtrl or LLButton in LLTabTuple
 		 */
@@ -294,6 +304,7 @@ private:
 
 	bool							mCustomIconCtrlUsed;
 	S32								mTabIconCtrlPad;
+	bool							mUseTabEllipses;
 };
 
 #endif  // LL_TABCONTAINER_H

indra/newview/skins/default/xui/en/floater_im_container.xml

@@ -24,6 +24,8 @@
      tab_height="16"
      use_custom_icon_ctrl="true"
      tab_icon_ctrl_pad="2"
+     font_halign="left"
+     use_ellipses="true"
      top="0"
      width="390" />
     <icon