diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-12-04 16:09:15 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-12-04 16:09:15 -0500 |
| commit | d69a0e692e420e5b95e9bcb4ad1e7c5cfa283468 (patch) | |
| tree | dba5f50b894e52ad961f599702f3da801e3518b9 /indra/llprimitive/lltextureentry.h | |
| parent | c4de6b93d3c3f182fc7bf28e5c285e4d14da0764 (diff) | |
| parent | 6ed6158ac68076b6a6242a3a74a3394846227e04 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
| -rwxr-xr-x | indra/llprimitive/lltextureentry.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index 81e2e8a5a2..a40c3988f2 100755 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -160,8 +160,6 @@ 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. @@ -219,8 +217,6 @@ 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 |