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

Fix crash in LLMultiFloater::setCanResize() 

Reviewed (conceptually) by Richard and James
meow-7.2.2
Rick Pasetto 2009-10-30 16:01:58 -07:00
parent 8518ac3e29
commit c54faf2823
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llfloaterreg.cpp
View File

@ -127,7 +127,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key)
bool success = LLUICtrlFactory::getInstance()->buildFloater(res, xui_file, NULL);
if (!success)
{
llwarns << "Failed to buid floater type: '" << name << "'." << llendl;
llwarns << "Failed to build floater type: '" << name << "'." << llendl;
return NULL;
}

3
indra/llui/llmultifloater.cpp
View File

@ -434,6 +434,7 @@ void LLMultiFloater::onTabSelected()
void LLMultiFloater::setCanResize(BOOL can_resize)
{
LLFloater::setCanResize(can_resize);
if (!mTabContainer) return;
if (isResizable() && mTabContainer->getTabPosition() == LLTabContainer::BOTTOM)
{
mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
@ -457,6 +458,8 @@ BOOL LLMultiFloater::postBuild()
}
mTabContainer = getChild<LLTabContainer>("Preview Tabs");
setCanResize(mResizable);
return TRUE;
}