diff options
author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/llprimitive/lltextureentry.h | |
parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) |
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
-rwxr-xr-x | indra/llprimitive/lltextureentry.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index a40c3988f2..81e2e8a5a2 100755 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -160,6 +160,8 @@ public: const LLMaterialID& getMaterialID() const { return mMaterialID; }; const LLMaterialPtr getMaterialParams() const { return mMaterial; }; + bool isMatParamsInitFromServer() const { return mInitMatParamsFromServer; }; + // *NOTE: it is possible for hasMedia() to return true, but getMediaData() to return NULL. // CONVERSELY, it is also possible for hasMedia() to return false, but getMediaData() // to NOT return NULL. @@ -217,6 +219,8 @@ protected: bool mMaterialUpdatePending; LLMaterialID mMaterialID; LLMaterialPtr mMaterial; + bool mInitMatParamsFromServer; // Flag to identification when material paramas initialized from + // Note the media data is not sent via the same message structure as the rest of the TE LLMediaEntry* mMediaEntry; // The media data for the face |