diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
| commit | 625dd5ead25a71cceb2973192438ae9442ed73d1 (patch) | |
| tree | 142a6613f77f6b725dd99e59ef771fefb34cf127 /indra/newview/llchathistory.cpp | |
| parent | 64d83571c9596900f32d0af63c2dd9968badb82f (diff) | |
| parent | f71098a4065896bd69fcfe55c83dd3a562a7ac64 (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 45c2d26fde..e1c96d4a16 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -491,7 +491,7 @@ void LLChatHistory::initFromParams(const LLChatHistory::Params& p) panel_p.background_visible = false; panel_p.has_border = false; panel_p.mouse_opaque = false; - stackp->addPanel(LLUICtrlFactory::create<LLPanel>(panel_p), 0, 30, true, false, LLLayoutStack::ANIMATE); + stackp->addPanel(LLUICtrlFactory::create<LLPanel>(panel_p), 0, 30, S32_MAX, S32_MAX, true, false, LLLayoutStack::ANIMATE); panel_p.name = "new_text_notice_holder"; LLRect new_text_notice_rect = getLocalRect(); @@ -509,7 +509,7 @@ void LLChatHistory::initFromParams(const LLChatHistory::Params& p) mMoreChatText = LLUICtrlFactory::create<LLTextBox>(text_p, mMoreChatPanel); mMoreChatText->setClickedCallback(boost::bind(&LLChatHistory::onClickMoreText, this)); - stackp->addPanel(mMoreChatPanel, 0, 0, false, false, LLLayoutStack::ANIMATE); + stackp->addPanel(mMoreChatPanel, 0, 0, S32_MAX, S32_MAX, false, false, LLLayoutStack::ANIMATE); } |