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

12
indra/newview/llpanelplace.cpp
View File

@@ -289,16 +289,16 @@ void LLPanelPlace::processParcelInfo(const LLParcelData& parcel_data)
}
// Just use given region position for display
S32 region_x = llmath::llround(mPosRegion.mV[0]);
S32 region_y = llmath::llround(mPosRegion.mV[1]);
S32 region_z = llmath::llround(mPosRegion.mV[2]);
S32 region_x = ll_round(mPosRegion.mV[0]);
S32 region_y = ll_round(mPosRegion.mV[1]);
S32 region_z = ll_round(mPosRegion.mV[2]);
// If the region position is zero, grab position from the global
if(mPosRegion.isExactlyZero())
{
region_x = llmath::llround(parcel_data.global_x) % REGION_WIDTH_UNITS;
region_y = llmath::llround(parcel_data.global_y) % REGION_WIDTH_UNITS;
region_z = llmath::llround(parcel_data.global_z);
region_x = ll_round(parcel_data.global_x) % REGION_WIDTH_UNITS;
region_y = ll_round(parcel_data.global_y) % REGION_WIDTH_UNITS;
region_z = ll_round(parcel_data.global_z);
}
if(mPosGlobal.isExactlyZero())