From 2834c7968de9efc81d3c7db8a9c2b5cd2f16d6a3 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 29 Apr 2014 14:24:00 -0700
Subject: MAINT-3975 FIX Group Invitation window omits ? button for listed
 residents (INTEREST LIST RC only)

---
 indra/llui/lltooltip.cpp                                  | 3 ++-
 indra/newview/skins/default/xui/en/panel_group_invite.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 5e1f12996e..7f2224870d 100755
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -477,7 +477,8 @@ void LLToolTipMgr::show(const std::string& msg)
 void LLToolTipMgr::show(const LLToolTip::Params& params)
 {
 	if (!params.styled_message.isProvided() 
-		&& (!params.message.isProvided() || params.message().empty())) return;
+		&& (!params.message.isProvided() || params.message().empty())
+		&& !params.image.isProvided()) return;
 
 	// fill in default tooltip params from tool_tip.xml
 	LLToolTip::Params params_with_defaults(params);
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 124c0596c3..f47ed992ca 100755
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -76,7 +76,7 @@
         Choose what Role to assign them to:
     </text>
     <combo_box
-     height="16"
+     height="20"
      layout="topleft"
      left_delta="0"
      name="role_name"
-- 
cgit v1.2.3