diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
| commit | 99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch) | |
| tree | 8951e7aabe026917d299436ebc28019f9966cd02 /indra/newview/llpanelplaceinfo.cpp | |
| parent | 746037362ed07af0c799caf22cf9e425744359a0 (diff) | |
| parent | 7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llpanelplaceinfo.cpp')
| -rw-r--r-- | indra/newview/llpanelplaceinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 9ebc8ca2b9..f6133d4446 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -256,7 +256,7 @@ void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent) static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0); S32 scroll_height = mScrollContainer->getRect().getHeight(); - if (mScrollingPanelMinHeight >= scroll_height) + if (mScrollingPanelMinHeight > scroll_height) { mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight); } |