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

Merge llqtwebkit package fix take 3 with viewer-2-0 tip.

meow-7.2.2
brad kittenbrink 2010-03-19 17:54:23 -04:00
parent 241988c408 25a8ccd364
commit 4b6b0fda9d
5 changed files with 16 additions and 5 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();
}
}

7
indra/newview/llvovolume.cpp
View File

@ -962,8 +962,11 @@ void LLVOVolume::updateSculptTexture()
if (isSculpted())
{
LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
LLUUID id = sculpt_params->getSculptTexture();
mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
LLUUID id = sculpt_params->getSculptTexture();
if (id.notNull())
{
mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
}
}
else
{

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"

1
indra/newview/skins/default/xui/en/floater_preferences.xml
View File

@ -39,6 +39,7 @@
</button>
<tab_container
follows="all"
halign="left"
height="410"
layout="topleft"
left="0"