diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-02 17:42:14 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-02 17:42:14 -0400 |
| commit | d53161497a8093731352ebcc62378812fbeb1abc (patch) | |
| tree | c128e68a35ab2fa53f810bb716dbeac2c8fca99f | |
| parent | 819d6bec16a34beb057e60961ed17d62fad19bce (diff) | |
| parent | 9eef61327bed3e71c2342d333596251d59b1500a (diff) | |
merge
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 14 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 8beac65053..c593481b40 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2647,6 +2647,20 @@ LLTexLayerSet* LLVOAvatarSelf::getLayerSet(ETextureIndex index) const return NULL; } +LLTexLayerSet* LLVOAvatarSelf::getLayerSet(EBakedTextureIndex baked_index) const +{ + /* switch(index) + case TEX_HEAD_BAKED: + case TEX_HEAD_BODYPAINT: + return mHeadLayerSet; */ + if (baked_index >= 0 && baked_index < BAKED_NUM_INDICES) + { + return mBakedTextureDatas[baked_index].mTexLayerSet; + } + return NULL; +} + + // static void LLVOAvatarSelf::onCustomizeStart() { diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 17cdd514cc..004f7e885b 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -241,6 +241,7 @@ public: void requestLayerSetUpload(LLVOAvatarDefines::EBakedTextureIndex i); void requestLayerSetUpdate(LLVOAvatarDefines::ETextureIndex i); LLTexLayerSet* getLayerSet(LLVOAvatarDefines::ETextureIndex index) const; + LLTexLayerSet* getLayerSet(LLVOAvatarDefines::EBakedTextureIndex baked_index) const; //-------------------------------------------------------------------- // Composites |