diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:07:17 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:07:17 -0500 |
| commit | 2369fa96c24bafbd032c85b58767502cfd37ebaf (patch) | |
| tree | 65926883dc0b5f81207e76d7d4f2ad64d56ebf40 /indra/newview/llvoavatarself.h | |
| parent | 9b9c3f03ac581d312ad61f433877979fba0614bb (diff) | |
| parent | 788dbcce6661923c6963a454fb094239cc669723 (diff) | |
Automated merge.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index a1cad82eff..e376e5e9ef 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -209,6 +209,7 @@ private: //-------------------------------------------------------------------- public: LLVOAvatarDefines::ETextureIndex getBakedTE(const LLTexLayerSet* layerset ) const; + void setNewBakedTexture(LLVOAvatarDefines::EBakedTextureIndex i, const LLUUID &uuid); void setNewBakedTexture(LLVOAvatarDefines::ETextureIndex i, const LLUUID& uuid); void setCachedBakedTexture(LLVOAvatarDefines::ETextureIndex i, const LLUUID& uuid); void forceBakeAllTextures(bool slam_for_debug = false); |