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

2
indra/newview/lltexturectrl.cpp
View File

@@ -1167,7 +1167,7 @@ LLTextureCtrl::LLTextureCtrl(
S32 image_top = getRect().getHeight();
S32 image_bottom = BTN_HEIGHT_SMALL;
S32 image_middle = (image_top + image_bottom) / 2;
S32 line_height = llmath::llround(LLFontGL::getFontSansSerifSmall()->getLineHeight());
S32 line_height = ll_round(LLFontGL::getFontSansSerifSmall()->getLineHeight());
mTentativeLabel = new LLTextBox( std::string("Multiple"),
LLRect(