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

@@ -154,9 +154,9 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
F32 global_x = (F32)self->mEventInfo.mPosGlobal.mdV[VX];
F32 global_y = (F32)self->mEventInfo.mPosGlobal.mdV[VY];
S32 region_x = llmath::llround(global_x) % REGION_WIDTH_UNITS;
S32 region_y = llmath::llround(global_y) % REGION_WIDTH_UNITS;
S32 region_z = llmath::llround((F32)self->mEventInfo.mPosGlobal.mdV[VZ]);
S32 region_x = ll_round(global_x) % REGION_WIDTH_UNITS;
S32 region_y = ll_round(global_y) % REGION_WIDTH_UNITS;
S32 region_z = ll_round((F32)self->mEventInfo.mPosGlobal.mdV[VZ]);
std::string desc = self->mEventInfo.mSimName + llformat(" (%d, %d, %d)", region_x, region_y, region_z);
self->mTBLocation->setText(desc);