diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-02 00:57:32 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-02 00:57:32 +0100 |
| commit | b4d6611ea7e5f3dfe01e7c7f7dae9c5b2c2347b8 (patch) | |
| tree | f2304ff568bf7f8c9a574530a477bf864cb877c6 /indra/newview/llviewertexture.h | |
| parent | c98522a40ec6855a11a781301fca7a3943ba5a25 (diff) | |
SL-9775
Add LLPointer<> on stack to avoid textures being deleted out from under the sky code.
Make textures used by sky settings remove their faces from media textures.
Add ability to detect when a given texture is viewer media with vfunc.
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 7b58c97bc4..022f937619 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -125,6 +125,8 @@ public: virtual BOOL isMissingAsset() const ; virtual void dump(); // debug info to LL_INFOS() + virtual BOOL isViewerMediaTexture() const { return false; } + /*virtual*/ bool bindDefaultImage(const S32 stage = 0) ; /*virtual*/ bool bindDebugImage(const S32 stage = 0) ; /*virtual*/ void forceImmediateUpdate() ; @@ -576,6 +578,8 @@ public: BOOL isPlaying() const {return mIsPlaying;} void setMediaImpl() ; + virtual BOOL isViewerMediaTexture() const { return true; } + void initVirtualSize() ; void invalidateMediaImpl() ; |