Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'FMODStudio'

Browse Source 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
This commit is contained in:
Shyotl
2015-01-26 17:15:46 -06:00
parent 2132978c41 6e4ef6f8a1
commit b865b92a6a
224 changed files with 4964 additions and 4731 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 = llround(parcel_data.global_x) % REGION_WIDTH_UNITS;
S32 region_y = llround(parcel_data.global_y) % REGION_WIDTH_UNITS;
S32 region_z = llround(parcel_data.global_z);
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);
label = llformat("%s (%d, %d, %d)",
parcel_data.sim_name.c_str(), region_x, region_y, region_z);