Sync llcommon with Alchemy a bit.
llmath::llround->ll_round LL_ICC->LL_INTELC Add llpredicate Add LL_CPP11 macro Remove llhash Update llinitparam, llsd and all relatives of it.
This commit is contained in:
@@ -602,7 +602,7 @@ bool LLScrollListCtrl::updateColumnWidths()
|
||||
S32 new_width = column->getWidth();
|
||||
if (column->mRelWidth >= 0)
|
||||
{
|
||||
new_width = (S32)llmath::llround(column->mRelWidth*mItemListRect.getWidth());
|
||||
new_width = (S32)ll_round(column->mRelWidth*mItemListRect.getWidth());
|
||||
}
|
||||
else if (column->mDynamicWidth)
|
||||
{
|
||||
@@ -2829,7 +2829,7 @@ void LLScrollListCtrl::addColumn(const LLScrollListColumn::Params& column_params
|
||||
}
|
||||
if (new_column->mRelWidth >= 0)
|
||||
{
|
||||
new_column->setWidth((S32)llmath::llround(new_column->mRelWidth*mItemListRect.getWidth()));
|
||||
new_column->setWidth((S32)ll_round(new_column->mRelWidth*mItemListRect.getWidth()));
|
||||
}
|
||||
else if(new_column->mDynamicWidth)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user