MAINT-3975 FIX Group Invitation window omits ? button for listed residents (INTEREST LIST RC only)

master
Richard Linden 2014-04-29 14:24:00 -07:00
parent 05c5a27fd3
commit 2834c7968d
2 changed files with 3 additions and 2 deletions

View File

@ -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);

View File

@ -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"