diff options
| author | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
| commit | 1b550aaec246063090fe7143145d69eebfbd4680 (patch) | |
| tree | 66b1d7c9f424e0183c5488037fcdae3a37916955 /indra/llprimitive | |
| parent | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (diff) | |
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 1 | ||||
| -rw-r--r-- | indra/llprimitive/lltextureentry.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 628f7f8cc8..b41879380f 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -863,6 +863,7 @@ void LLPrimitive::copyTEs(const LLPrimitive *primitivep) setTERotation(i, tep->getRotation()); setTEBumpShinyFullbright(i, tep->getBumpShinyFullbright()); setTEMediaTexGen(i, tep->getMediaTexGen()); + setTEGlow(i, tep->getGlow()); } } diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index d8efb5993e..960d97ba0c 100644 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -147,6 +147,10 @@ protected: U8 mBump; // Bump map, shiny, and fullbright U8 mMediaFlags; // replace with web page, movie, etc. F32 mGlow; + + // NOTE: when adding new data to this class, in addition to adding it to the serializers asLLSD/fromLLSD and the + // message packers (e.g. LLPrimitive::packTEMessage) you must also implement its copy in LLPrimitive::copyTEs() + }; |