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

2
indra/newview/llworld.cpp
View File

@@ -1124,7 +1124,7 @@ void LLWorld::updateWaterObjects()
// Count the found coastline.
F32 new_water_height = water_heights[index];
LL_DEBUGS("WaterHeight") << " This is void; counting coastline with water height of " << new_water_height << LL_ENDL;
S32 new_water_height_cm = llround(new_water_height * 100);
S32 new_water_height_cm = llmath::llround(new_water_height * 100);
int count = (water_height_counts[new_water_height_cm] += 1);
// Just use the lowest water height: this is mainly about the horizon water,
// and whatever we do, we don't want it to be possible to look under the water