diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 09:30:39 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 09:30:39 -0700 |
| commit | 470d1595cc1c1c7c7ec3ab192e68622751423354 (patch) | |
| tree | 079cd01cc1b247973f2e5fd589389cc8e0013b13 /indra/newview/llviewertexture.h | |
| parent | 06097302f4ad8786913e77514d5d60678da3160d (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merge viewer-release
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 022f937619..78bebb542a 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -188,6 +188,9 @@ private: virtual void switchToCachedImage(); static bool isMemoryForTextureLow() ; + static bool isMemoryForTextureSuficientlyFree(); + static void getGPUMemoryForTextures(S32Megabytes &gpu, S32Megabytes &physical); + protected: LLUUID mID; S32 mTextureListType; // along with mID identifies where to search for this texture in TextureList @@ -229,7 +232,7 @@ public: static S32 sMaxSculptRez ; static U32 sMinLargeImageSize ; static U32 sMaxSmallImageSize ; - static BOOL sFreezeImageScalingDown ;//do not scale down image res if set. + static bool sFreezeImageUpdates; static F32 sCurrentTime ; enum EDebugTexels @@ -545,7 +548,7 @@ public: /*virtual*/ S8 getType() const; // Process image stats to determine priority/quality requirements. /*virtual*/ void processTextureStats(); - BOOL isUpdateFrozen() ; + bool isUpdateFrozen() ; private: void init(bool firstinit) ; @@ -578,7 +581,7 @@ public: BOOL isPlaying() const {return mIsPlaying;} void setMediaImpl() ; - virtual BOOL isViewerMediaTexture() const { return true; } + virtual bool isViewerMediaTexture() const { return true; } void initVirtualSize() ; void invalidateMediaImpl() ; |