Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync llcommon with Alchemy a bit.

Browse Source 
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:
Inusaito Sayori
2015-03-20 22:04:04 -04:00
parent 16a2b28c1b
commit 72080e79e9
135 changed files with 1940 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfolderview.cpp
View File

@@ -535,7 +535,7 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen
updateRenamerPosition();
mTargetHeight = (F32)target_height;
return llmath::llround(mTargetHeight);
return ll_round(mTargetHeight);
}
const std::string LLFolderView::getFilterSubString(BOOL trim)
@@ -2041,7 +2041,7 @@ void LLFolderView::scrollToShowItem(LLFolderViewItem* item, const LLRect& constr
LLRect item_scrolled_rect; // item position relative to display area of scroller
S32 icon_height = mIcon.isNull() ? 0 : mIcon->getHeight();
S32 label_height = llmath::llround(getLabelFontForStyle(mLabelStyle)->getLineHeight());
S32 label_height = ll_round(getLabelFontForStyle(mLabelStyle)->getLineHeight());
// when navigating with keyboard, only move top of opened folder on screen, otherwise show whole folder
S32 max_height_to_show = item->isOpen() && mScrollContainer->hasFocus() ? (llmax( icon_height, label_height ) + ICON_PAD) : local_rect.getHeight();