diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 735a79899a3c48ebeb35de9faa058cd29a37633b..13706880a07a61c2f29cefb813fd0504976a2e9e 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -104,7 +104,7 @@ S32Bytes LLViewerTexture::sBoundTextureMemory; S32Bytes LLViewerTexture::sTotalTextureMemory; S32Bytes LLViewerTexture::sMaxDesiredTextureMem; #endif -S8 LLViewerTexture::sCameraMovingDiscardBias = 0; +S16 LLViewerTexture::sCameraMovingDiscardBias = 0; F32 LLViewerTexture::sCameraMovingBias = 0.0f; S32 LLViewerTexture::sMaxSculptRez = 128; //max sculpt image size const S32 MAX_CACHED_RAW_IMAGE_AREA = 64 * 64; @@ -606,7 +606,7 @@ void LLViewerTexture::updateClass(const F32 velocity, const F32 angular_velocity F32 camera_moving_speed = LLViewerCamera::getInstance()->getAverageSpeed(); F32 camera_angular_speed = LLViewerCamera::getInstance()->getAverageAngularSpeed(); sCameraMovingBias = llmax(0.2f * camera_moving_speed, 2.0f * camera_angular_speed - 1); - sCameraMovingDiscardBias = (S8)(sCameraMovingBias); + sCameraMovingDiscardBias = (S16)(sCameraMovingBias); LLViewerTexture::sFreezeImageScalingDown = (sBoundTextureMemory < 0.75f * sMaxBoundTextureMemory * texmem_middle_bound_scale) && (sTotalTextureMemory < 0.75f * sMaxTotalTextureMem * texmem_middle_bound_scale); diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 897d330d52309df0bac6da14e04f5d6f58ae955d..a554f2fd072ccb18cfe770e1310434c2ca8da600 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -224,7 +224,7 @@ public: static S32Bytes sTotalTextureMemory; static S32Bytes sMaxDesiredTextureMem; #endif - static S8 sCameraMovingDiscardBias; + static S16 sCameraMovingDiscardBias; static F32 sCameraMovingBias; static S32 sMaxSculptRez ; static S32 sMinLargeImageSize ;