diff options
| author | Neal Orman <nyx@lindenlab.com> | 2009-07-14 15:14:46 +0000 |
|---|---|---|
| committer | Neal Orman <nyx@lindenlab.com> | 2009-07-14 15:14:46 +0000 |
| commit | 56e045547951cdad356da38ba3da4251d58d3fb8 (patch) | |
| tree | 7d7f14cbf9741b7e5b12f36a04062888b31aa8cd /indra/newview/lltexlayer.cpp | |
| parent | 064e917e3d34fa04edf20a6d583819f194171ea7 (diff) | |
QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code.
-Nyx
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index a570a89b28..5a5f187415 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -1237,6 +1237,16 @@ LLTexLayer::LLTexLayer(LLTexLayerSet* layer_set) : { } +LLTexLayer::LLTexLayer(const LLTexLayer &layer) : + mTexLayerSet( layer.mTexLayerSet ) +{ + setInfo(layer.getInfo()); + + + mHasMorph = layer.mHasMorph; + +} + LLTexLayer::~LLTexLayer() { // mParamAlphaList and mParamColorList are LLViewerVisualParam's and get |