diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-06-23 15:50:02 -0400 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-06-23 15:50:02 -0400 |
| commit | ceee22b0bb2b9a691f6f37bc76cf8e4cf2eea1b3 (patch) | |
| tree | d87f695d44487be09cfec3813e93812595af03f3 | |
| parent | e7d86046d9bba6f0da34a6417e6bb45be518accd (diff) | |
| parent | 4ebf8e3abc365f79b41008de8fd6509c46ea44bd (diff) | |
Merge
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index d87ee428aa..c34acd3db6 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -419,7 +419,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize) && !force_resize)) { S32 relevant_dimension = (mOrientation == HORIZONTAL) ? (*panel_it)->getRect().getWidth() : (*panel_it)->getRect().getHeight(); - F32 relevant_min = ((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim); + S32 relevant_min = llround((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim); shrink_headroom_total += relevant_dimension - relevant_min; } @@ -428,7 +428,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize) num_resizable_panels++; S32 relevant_dimension = (mOrientation == HORIZONTAL) ? (*panel_it)->getRect().getWidth() : (*panel_it)->getRect().getHeight(); - F32 relevant_min = ((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim); + S32 relevant_min = llround((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim); shrink_headroom_available += relevant_dimension - relevant_min; shrink_headroom_total += relevant_dimension - relevant_min; |