diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-04-14 13:46:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-04-14 13:46:01 -0700 |
| commit | d631f2fd4daed5e3b10fc6dc290aa16f3d0591f0 (patch) | |
| tree | afc5139a2d530bdca9233308d2b6d6d4532bc6c4 /indra/newview/llviewertexture.h | |
| parent | 5411f349e5ed8835d5c99dbfb19a0934a6e5e28f (diff) | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) | |
Pull merge from lindenlab/viewer-tools-update (includes viewer-release)
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rwxr-xr-x | indra/newview/llviewertexture.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 05912404e4..aed7e94945 100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -169,9 +169,13 @@ public: /*virtual*/ void updateBindStatsForTester() ; protected: void cleanup() ; - void init(bool firstinit) ; + void init(bool firstinit) ; void reorganizeFaceList() ; void reorganizeVolumeList() ; + + void notifyAboutMissingAsset(); + void notifyAboutCreatingTexture(); + private: friend class LLBumpImageList; friend class LLUIImageList; @@ -307,10 +311,11 @@ public: void addToCreateTexture(); + // ONLY call from LLViewerTextureList BOOL createTexture(S32 usename = 0); - void destroyTexture() ; - + void destroyTexture() ; + virtual void processTextureStats() ; F32 calcDecodePriority() ; |