Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLVOAvatar class members reorganized to line up with V2 better. Added accessors from v2 where applicable. mBakedTextureData renamed to mBakedTextureDatas

Browse Source
This commit is contained in:
Shyotl
2011-05-14 12:38:47 -05:00
parent 8df737b488
commit 4e47446be1
20 changed files with 1375 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/lltexlayer.h
View File

@@ -45,6 +45,7 @@
#include "llwearable.h"
#include "v4color.h"
#include "llfloater.h"
#include "llvoavatar.h"
class LLTexLayerSetInfo;
class LLTexLayerSet;
@@ -309,20 +310,6 @@ protected:
LLTexLayerSetInfo *mInfo;
};
//-----------------------------------------------------------------------------
// LLMaskedMorph
//-----------------------------------------------------------------------------
class LLMaskedMorph
{
public:
LLMaskedMorph( LLPolyMorphTarget *morph_target, BOOL invert );
public:
LLPolyMorphTarget *mMorphTarget;
BOOL mInvert;
};
//-----------------------------------------------------------------------------
// LLTexLayer
// A single texture layer
@@ -374,7 +361,7 @@ protected:
alpha_list_t mParamAlphaList;
typedef std::deque<LLMaskedMorph> morph_list_t;
typedef std::deque<LLVOAvatar::LLMaskedMorph> morph_list_t;
morph_list_t mMaskedMorphs;
typedef std::map<U32, U8*> alpha_cache_t;
alpha_cache_t mAlphaCache;