diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-07 10:31:50 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-07 10:31:50 -0400 |
| commit | b1e9c9bab085c55bab217a641716a40b8d44ed9e (patch) | |
| tree | 1f66e51960d9e96c49030fb61f7547c8e95cc244 /indra/newview/llwearable.cpp | |
| parent | 82f8be5ca32d60704819b26f0323351d4bbb9b04 (diff) | |
| parent | aaf296c2cec420d6f1b3623e1413e71b00cf3966 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 9e9b46473e..121e691710 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -656,7 +656,7 @@ void LLWearable::writeToAvatar() image_id = LLVOAvatarDictionary::getDefaultTextureImageID((ETextureIndex) te); } LLViewerTexture* image = LLViewerTextureManager::getFetchedTexture( image_id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE ); - // MULTI-WEARABLE: replace hard-coded 0 + // MULTI-WEARABLE: assume index 0 will be used when writing to avatar. TODO: eliminate the need for this. gAgentAvatarp->setLocalTextureTE(te, image, 0); } } |