diff options
| author | Richard Linden <none@none> | 2011-06-23 12:02:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 12:02:59 -0700 |
| commit | 4ebf8e3abc365f79b41008de8fd6509c46ea44bd (patch) | |
| tree | af050a9da108b1907f9edaaac34070bcc37570af | |
| parent | af142618f9c18a418bd11ab8eae6c83caa03ddac (diff) | |
fix for gcc build
| -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; |