diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-09 15:41:07 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-09 15:41:07 -0700 |
| commit | 425f0128143b57bcb09e45488c6f20af8198584b (patch) | |
| tree | 09ad2e8754f409851e5bfc2284706147715da591 | |
| parent | 76c2a85661389469df77547e1732620755a1a729 (diff) | |
NORSPEC-164 fix TE copy ctor and operator= to include material pointer in addition to ID
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 691216e035..53816266eb 100644 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -85,7 +85,7 @@ LLTextureEntry::LLTextureEntry(const LLTextureEntry &rhs) mMediaFlags = rhs.mMediaFlags; mGlow = rhs.mGlow; mMaterialID = rhs.mMaterialID; - + mMaterial = rhs.mMaterial; if (rhs.mMediaEntry != NULL) { // Make a copy mMediaEntry = new LLMediaEntry(*rhs.mMediaEntry); @@ -107,6 +107,7 @@ LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs) mMediaFlags = rhs.mMediaFlags; mGlow = rhs.mGlow; mMaterialID = rhs.mMaterialID; + mMaterial = rhs.mMaterial; if (mMediaEntry != NULL) { delete mMediaEntry; } |