summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index f4e8e3eae1..fe9f8a2f9b 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -417,8 +417,8 @@ void LLViewerTexture::initClass()
if(gSavedSettings.getBOOL("TextureFetchDebuggerEnabled"))
{
- sTexelPixelRatio = gSavedSettings.getF32("TexelPixelRatio");
-}
+ sTexelPixelRatio = gSavedSettings.getF32("TexelPixelRatio");
+ }
}
// static
@@ -1908,7 +1908,7 @@ void LLViewerFetchedTexture::updateVirtualSize()
for(U32 i = 0 ; i < mNumFaces ; i++)
{
LLFace* facep = mFaceList[i] ;
- if(facep->getDrawable()->isRecentlyVisible())
+ if( facep && facep->getDrawable() && facep->getDrawable()->isRecentlyVisible())
{
addTextureStats(facep->getVirtualSize()) ;
setAdditionalDecodePriority(facep->getImportanceToCamera()) ;
@@ -2244,7 +2244,7 @@ void LLViewerFetchedTexture::forceToDeleteRequest()
mIsFetching = FALSE ;
}
- resetTextureStats();
+ resetTextureStats();
mDesiredDiscardLevel = getMaxDiscardLevel() + 1;
}
@@ -2293,9 +2293,9 @@ void LLViewerFetchedTexture::setLoadedCallback( loaded_callback_func loaded_call
if(mPauseLoadedCallBacks)
{
if(!pause)
- {
- unpauseLoadedCallbacks(src_callback_list) ;
- }
+ {
+ unpauseLoadedCallbacks(src_callback_list) ;
+ }
}
else if(pause)
{