diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-04-03 23:49:53 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-04-03 23:49:53 -0500 |
| commit | 57b371ab9b5d55b41f3760b48e5e0b0aa906be57 (patch) | |
| tree | 73a8991d5a0cf6ccc7f0953435a3e4c23e1ed218 /indra/llprimitive | |
| parent | e280422d4454549e4fd992ad45ec2ea4d41b08eb (diff) | |
| parent | 7a820b88fc45a4a16573387782e1c3f7e412da68 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmaterial.h | 6 | ||||
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index fd35045e45..dc3484309c 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -32,8 +32,10 @@ #include "llmaterialid.h" #include "llsd.h" #include "v4coloru.h" +#include "llpointer.h" +#include "llrefcount.h" -class LLMaterial +class LLMaterial : public LLRefCount { public: @@ -115,6 +117,6 @@ protected: U8 mAlphaMaskCutoff; }; -typedef boost::shared_ptr<LLMaterial> LLMaterialPtr; +typedef LLPointer<LLMaterial> LLMaterialPtr; #endif // LL_LLMATERIAL_H diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 23b15b697c..691216e035 100644 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -535,6 +535,10 @@ S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID) if (mMaterialID != pMaterialID) { mMaterialID = pMaterialID; + if (mMaterialID.isNull()) + { + setMaterialParams(NULL); + } return TEM_CHANGE_TEXTURE; } return TEM_CHANGE_NONE; |