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:
Inusaito Sayori
2015-03-20 22:04:04 -04:00
parent 16a2b28c1b
commit 72080e79e9
135 changed files with 1940 additions and 1282 deletions

View File

@@ -189,7 +189,7 @@ void LLCloudGroup::updatePuffCount()
return;
}
S32 i;
S32 target_puff_count = llmath::llround(CLOUD_DENSITY * mDensity);
S32 target_puff_count = ll_round(CLOUD_DENSITY * mDensity);
target_puff_count = llmax(0, target_puff_count);
target_puff_count = llmin(CLOUD_COUNT_MAX, target_puff_count);
S32 current_puff_count = (S32) mCloudPuffs.size();