summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayerparams.h
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-06-03 14:33:36 -0700
committerEli Linden <eli@lindenlab.com>2010-06-03 14:33:36 -0700
commitfbee0d8ef1cfd97c2ef52398d19d038c145bae67 (patch)
tree9eecdbde01e4cc531169568c70b3859a3c7d5159 /indra/newview/lltexlayerparams.h
parent2d93672587e6f5ca46e06d768a1f6f9df4ebac37 (diff)
parente2b8c1c699f75e234776beda939205a247fb1bc3 (diff)
Merge
Diffstat (limited to 'indra/newview/lltexlayerparams.h')
-rw-r--r--indra/newview/lltexlayerparams.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/indra/newview/lltexlayerparams.h b/indra/newview/lltexlayerparams.h
index 93d01352d4..7747ee1ebf 100644
--- a/indra/newview/lltexlayerparams.h
+++ b/indra/newview/lltexlayerparams.h
@@ -42,6 +42,10 @@ class LLViewerTexture;
class LLVOAvatar;
class LLWearable;
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// LLTexLayerParam
+//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
class LLTexLayerParam : public LLViewerVisualParam
{
public:
@@ -55,9 +59,10 @@ protected:
LLVOAvatar* mAvatar;
};
-//-----------------------------------------------------------------------------
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// LLTexLayerParamAlpha
//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
class LLTexLayerParamAlpha : public LLTexLayerParam
{
public:
@@ -124,9 +129,10 @@ private:
// LLTexLayerParamAlpha
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// LLTexLayerParamColor
//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
class LLTexLayerParamColor : public LLTexLayerParam
{
public:
@@ -184,8 +190,9 @@ private:
S32 mNumColors;
};
-//
-// LLTexLayerParamColor
-//-----------------------------------------------------------------------------
+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;
+typedef std::vector<LLTexLayerParamAlphaInfo *> param_alpha_info_list_t;
#endif