livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Kent Quirk 2010-03-19 14:57:38 -04:00
parent 08d210c7e9 0f620c1001
commit a2bfe92369
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/llmultifloater.cpp
View File

@ -352,6 +352,13 @@ BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask)
if (floater && floater->canClose() && floater->isCloseable())
{
floater->closeFloater();
// EXT-5695 (Tabbed IM window loses focus if close any tabs by Ctrl+W)
// bring back focus on tab container if there are any tab left
if(mTabContainer->getTabCount() > 0)
{
mTabContainer->setFocus(TRUE);
}
}
return TRUE;
}

2
indra/newview/llchathistory.cpp
View File

@ -776,7 +776,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
button->getRect().mBottom));
button->setAutoResize(true);
button->autoResize();
offset += 2 * HPAD + button->getRect().getWidth();
offset += HPAD + button->getRect().getWidth();
button->setFollowsNone();
}
}

4
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -13,7 +13,7 @@
can_minimize="true"
can_close="true"
visible="false"
width="360"
width="385"
can_resize="true"
min_width="250"
min_height="190">
@ -22,7 +22,7 @@
default_tab_group="2"
follows="all"
height="320"
width="360"
width="385"
layout="topleft"
orientation="horizontal"
name="im_panels"