EXT-1393 "none" does not appear in object group list

EXT-1479 I18N: string in /en/widgets/location_input.xml wont honor its translation
and made tabs height customizable
reviewed by Richard

10 files changed, 30 insertions, 31 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index be48ebdf67..d05fd955db 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9645,17 +9645,6 @@
       <key>Value</key>
       <integer>16</integer>
     </map>
-    <key>UITabCntrTabHeight</key>
-    <map>
-      <key>Comment</key>
-      <string>UI Tab Container Tab Height</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>16</integer>
-    </map>
     <key>UITabCntrTabHPad</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 2b5e2369bb..2f67401301 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -255,6 +255,7 @@ void LLAvatarActions::inviteToGroup(const LLUUID& id)
 	LLFloaterGroupPicker* widget = LLFloaterReg::showTypedInstance<LLFloaterGroupPicker>("group_picker", LLSD(id));
 	if (widget)
 	{
+		widget->removeNoneOption();
 		widget->center();
 		widget->setPowersMask(GP_MEMBER_INVITE);
 		widget->setSelectGroupCallback(boost::bind(callback_invite_to_group, _1, id));
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index 3648898f28..45af515a86 100644
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -89,15 +89,6 @@ BOOL LLFloaterGroupPicker::postBuild()
 		list_ctrl->setContextMenu(LLScrollListCtrl::MENU_GROUP);
 	}
 	
-	// Remove group "none" from list. Group "none" is added in init_group_list(). 
-	// Some UI elements use group "none", we need to manually delete it here.
-	// Group "none" ID is LLUUID:null.
-	LLCtrlListInterface* group_list = list_ctrl->getListInterface();
-	if(group_list)
-	{
-		group_list->selectByValue(LLUUID::null);
-		group_list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
-	}
 
 	childSetAction("OK", onBtnOK, this);
 
@@ -110,6 +101,20 @@ BOOL LLFloaterGroupPicker::postBuild()
 	return TRUE;
 }
 
+void LLFloaterGroupPicker::removeNoneOption()
+{
+	// Remove group "none" from list. Group "none" is added in init_group_list(). 
+	// Some UI elements use group "none", we need to manually delete it here.
+	// Group "none" ID is LLUUID:null.
+	LLCtrlListInterface* group_list = getChild<LLScrollListCtrl>("group list")->getListInterface();
+	if(group_list)
+	{
+		group_list->selectByValue(LLUUID::null);
+		group_list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
+	}
+}
+
+
 void LLFloaterGroupPicker::onBtnOK(void* userdata)
 {
 	LLFloaterGroupPicker* self = (LLFloaterGroupPicker*)userdata;
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h
index 489238356d..ce3a470a23 100644
--- a/indra/newview/llfloatergroups.h
+++ b/indra/newview/llfloatergroups.h
@@ -72,6 +72,9 @@ public:
 	static LLFloaterGroupPicker* findInstance(const LLSD& seed);
 	static LLFloaterGroupPicker* createInstance(const LLSD& seed);
 
+	// for cases like inviting avatar to group we don't want the none option
+	void removeNoneOption();
+
 protected:
 	void ok();
 	static void onBtnOK(void* userdata);
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 0330a8c692..e15fdd3e35 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -1522,6 +1522,7 @@ bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& re
 	LLFloaterGroupPicker* widget = LLFloaterReg::showTypedInstance<LLFloaterGroupPicker>("group_picker", LLSD(gAgent.getID()));
 	if (widget)
 	{
+		widget->removeNoneOption();
 		widget->setSelectGroupCallback(boost::bind(&LLPanelEstateInfo::addAllowedGroup2, this, _1));
 		if (parent_floater)
 		{
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 16a10dc502..a3296dbffc 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -159,7 +159,9 @@ LLLocationInputCtrl::Params::Params()
 	add_landmark_image_selected("add_landmark_image_selected"),
 	add_landmark_button("add_landmark_button"),
 	add_landmark_hpad("add_landmark_hpad", 0),
-	info_button("info_button")
+	info_button("info_button"),
+	add_landmark_tool_tip("add_landmark_tool_tip"),
+	edit_landmark_tool_tip("edit_landmark_tool_tip")
 {
 }
 
@@ -170,7 +172,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mLocationContextMenu(NULL),
 	mAddLandmarkBtn(NULL),
 	mLandmarkImageOn(NULL),
-	mLandmarkImageOff(NULL)
+	mLandmarkImageOff(NULL),
+	mAddLandmarkTooltip(p.add_landmark_tool_tip),
+	mEditLandmarkTooltip(p.edit_landmark_tool_tip)
 {
 	// Lets replace default LLLineEditor with LLLocationLineEditor
 	// to make needed escaping while copying and cutting url
@@ -261,9 +265,6 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mAddLandmarkObserver	= new LLAddLandmarkObserver(this);
 	gInventory.addObserver(mRemoveLandmarkObserver);
 	gInventory.addObserver(mAddLandmarkObserver);
-
-	mAddLandmarkTooltip = LLTrans::getString("location_ctrl_add_landmark");
-	mEditLandmarkTooltip = LLTrans::getString("location_ctrl_edit_landmark");
 }
 
 LLLocationInputCtrl::~LLLocationInputCtrl()
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index c74a294ca3..cd5c482005 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -66,6 +66,8 @@ public:
 		Optional<S32>						add_landmark_hpad;
 		Optional<LLButton::Params>			add_landmark_button,
 											info_button;
+		Optional<std::string>				add_landmark_tool_tip;
+		Optional<std::string>				edit_landmark_tool_tip;
 		Params();
 	};
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 071744c33a..f620e8f2d7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2828,11 +2828,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Wild">Wild</string>
 <string name="Wrinkles">Wrinkles</string>
 	
-    <!-- Favorites Bar -->
-    <string name="location_ctrl_add_landmark">Add to My Landmarks</string>
-    <string name="location_ctrl_edit_landmark">Edit My Landmark</string>
-    <string name="favorite_landmark_loading_tooltip">(Loading...)</string>
-	
 	<!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index defa6ff00d..d86103aedc 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -18,6 +18,8 @@
                 max_chars="20"
                 follows="left|top"
                 allow_new_values="true"
+                add_landmark_tool_tip="Add this to My Landmarks"
+                edit_landmark_tool_tip="Edit My Landmark"
                 >
   <info_button name="Place Information"
                           label=""
@@ -37,7 +39,6 @@
                           image_hover_unselected="Favorite_Star_Over"
                           width="18"
                           height="18"
-                          tool_tip="Add this to My Landmarks"
                           follows="right|top"
                           scale_image="false"
 			  top="19"
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 6dfb6ecf9c..25d85899a1 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <tab_container tab_min_width="60"
                tab_max_width="150"
+               tab_height="16"
                tab_top_image_unselected="TabTop_Middle_Off"
                tab_top_image_selected="TabTop_Middle_Selected"
                tab_bottom_image_unselected="Toolbar_Left_Off"