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

6
indra/llui/llurlentry.cpp
View File

@@ -835,9 +835,9 @@ void LLUrlEntryParcel::processParcelInfo(const LLParcelData& parcel_data)
// If parcel name is empty use Sim_name (x, y, z) for parcel label.
else if (!parcel_data.sim_name.empty())
{
S32 region_x = llmath::llround(parcel_data.global_x) % REGION_WIDTH_UNITS;
S32 region_y = llmath::llround(parcel_data.global_y) % REGION_WIDTH_UNITS;
S32 region_z = llmath::llround(parcel_data.global_z);
S32 region_x = ll_round(parcel_data.global_x) % REGION_WIDTH_UNITS;
S32 region_y = ll_round(parcel_data.global_y) % REGION_WIDTH_UNITS;
S32 region_z = ll_round(parcel_data.global_z);
label = llformat("%s (%d, %d, %d)",
parcel_data.sim_name.c_str(), region_x, region_y, region_z);