diff options
| author | Callum Prentice <callum@lindenlab.com> | 2025-08-29 14:51:08 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2025-08-29 14:51:08 -0700 |
| commit | db69b09d82e29ea98c216d84d394f602a72b8f93 (patch) | |
| tree | 7cb1481c15eb8f9dfbc12d6ed1424131c98264fa /indra/newview/llviewertexture.h | |
| parent | 87ec630053aadcb5b5f6104f7d083acf4609e2e9 (diff) | |
| parent | e77eb6b5316ce68fbc8bc03c4b06fe0f13b3443d (diff) | |
Merge branch 'develop' into callum/viewer-cef-2025-08
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index f9311d85cb..d32c302d8e 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -115,6 +115,7 @@ public: static void initClass(); static void updateClass(); static bool isSystemMemoryLow(); + static F32 getSystemMemoryBudgetFactor(); LLViewerTexture(bool usemipmaps = true); LLViewerTexture(const LLUUID& id, bool usemipmaps) ; @@ -189,6 +190,8 @@ private: friend class LLBumpImageList; friend class LLUIImageList; + static U32Megabytes getFreeSystemMemory(); + protected: friend class LLViewerTextureList; LLUUID mID; |