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/llpreviewtexture.cpp
View File

@@ -590,7 +590,7 @@ void LLPreviewTexture::updateDimensions()
client_width = getRect().getWidth() - horiz_pad;
if (mAspectRatio > 0.f)
{
client_height = llmath::llround(client_width / mAspectRatio);
client_height = ll_round(client_width / mAspectRatio);
}
else
{
@@ -608,7 +608,7 @@ void LLPreviewTexture::updateDimensions()
if (client_height > max_height)
{
client_height = max_height;
client_width = llmath::llround(client_height * mAspectRatio);
client_width = ll_round(client_height * mAspectRatio);
}
}
else