diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
| commit | e7eaa94dfa1eba24cbf1667190a0be37b2f417e4 (patch) | |
| tree | 9e9db05ef4d37698a7fa5f68149f724aa569528d /indra/llprimitive/lltextureentry.h | |
| parent | 34fe371bfdeb6fc83818c58660c038c372c0f64a (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
Merge VR
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 |