diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-30 16:01:58 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-30 16:01:58 -0700 |
| commit | c54faf28236dce5cf35233bf37ae64bd6837776f (patch) | |
| tree | 7488f01b964136476755c3ac7fc5c81d50734240 /indra/llui | |
| parent | 8518ac3e29ea8df5df857509aa218250eafda011 (diff) | |
Fix crash in LLMultiFloater::setCanResize()
Reviewed (conceptually) by Richard and James
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llmultifloater.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index d60a879410..8bb9e0d9ff 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -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; } diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 7d21c7e0c1..78738c826d 100644 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -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; } |