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/newview/llviewermedia.cpp
View File

@@ -941,7 +941,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
{
F32 approximate_interest_dimension = (F32) sqrt(pimpl->getInterest());
pimpl->setLowPrioritySizeLimit(llround(approximate_interest_dimension));
pimpl->setLowPrioritySizeLimit(llmath::llround(approximate_interest_dimension));
}
}
else
@@ -2367,8 +2367,8 @@ void LLViewerMediaImpl::scaleTextureCoords(const LLVector2& texture_coords, S32
texture_y = 1.0 + texture_y;
// scale x and y to texel units.
*x = llround(texture_x * plugin->getTextureWidth());
*y = llround((1.0f - texture_y) * plugin->getTextureHeight());
*x = llmath::llround(texture_x * plugin->getTextureWidth());
*y = llmath::llround((1.0f - texture_y) * plugin->getTextureHeight());
// Adjust for the difference between the actual texture height and the amount of the texture in use.
*y -= (plugin->getTextureHeight() - plugin->getHeight());