diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/newview/llvoavatar.cpp | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 0236abf127..540cd1f04b 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5719,6 +5719,7 @@ void LLVOAvatar::requestLayerSetUpdate( LLVOAvatar::ELocTexIndex i ) break; + case LOCTEX_UPPER_JACKET: case LOCTEX_LOWER_JACKET: if( mUpperBodyLayerSet ) { @@ -5730,6 +5731,10 @@ void LLVOAvatar::requestLayerSetUpdate( LLVOAvatar::ELocTexIndex i ) mLowerBodyLayerSet->requestUpdate(); } break; + + case LOCTEX_NUM_ENTRIES: + llerrs << "Bogus texture value " << i << llendl; + break; } } @@ -7389,6 +7394,24 @@ void LLVOAvatar::setCachedBakedTexture( ETextureIndex te, const LLUUID& uuid ) mSkirtLayerSet->cancelUpload(); } break; + + case TEX_HEAD_BODYPAINT: + case TEX_UPPER_SHIRT: + case TEX_LOWER_PANTS: + case TEX_EYES_IRIS: + case TEX_HAIR: + case TEX_UPPER_BODYPAINT: + case TEX_LOWER_BODYPAINT: + case TEX_LOWER_SHOES: + case TEX_LOWER_SOCKS: + case TEX_UPPER_JACKET: + case TEX_LOWER_JACKET: + case TEX_UPPER_GLOVES: + case TEX_UPPER_UNDERSHIRT: + case TEX_LOWER_UNDERPANTS: + case TEX_SKIRT: + case TEX_NUM_ENTRIES: + break; } } |