summaryrefslogtreecommitdiff
path: root/indra/llui/llmultifloater.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-02 12:13:52 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-02 12:13:52 -0500
commitcdf639087011dc7f4510cedd9951e8d890818b97 (patch)
tree6d70a6994ab11f0677370dda4f80a205d00660a1 /indra/llui/llmultifloater.cpp
parent7335c6276865061d8b4a549b7cf29f8a8df929a0 (diff)
parent3783852444825edf420e6109927df21fd004c3e7 (diff)
merging in viewer2 changes
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/llui/llmultifloater.cpp')
-rw-r--r--indra/llui/llmultifloater.cpp3
1 files changed, 3 insertions, 0 deletions
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;
}