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 | 5aa3f3c808976c3b709bd8141d4338e910c49691 (patch) | |
| tree | ebb9ef3153fa1ba63d0b286f74a210ef5ccbe24f /indra/llprimitive | |
| parent | 8ba1b1f797948ee8b082f045ed444fbcd96c3412 (diff) | |
NORSPEC-164 fix TE copy ctor and operator= to include material pointer in addition to ID
Diffstat (limited to 'indra/llprimitive')
| -rwxr-xr-x | 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 100755 --- 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; } |