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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/lltexlayer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h index c3ad07a218..b0ac13913e 100644 --- a/indra/newview/lltexlayer.h +++ b/indra/newview/lltexlayer.h @@ -53,6 +53,7 @@ class LLTexLayerParamColorInfo; class LLTexLayerParamAlpha; class LLTexLayerParamAlphaInfo; + typedef std::vector<LLTexLayerParamColor *> param_color_list_t; typedef std::vector<LLTexLayerParamAlpha *> param_alpha_list_t; typedef std::vector<LLTexLayerParamColorInfo *> param_color_info_list_t; @@ -74,6 +75,7 @@ public: }; LLTexLayer(LLTexLayerSet* const layer_set); + LLTexLayer(const LLTexLayer &layer); ~LLTexLayer(); const LLTexLayerInfo* getInfo() const { return mInfo; } |