diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-03 14:47:32 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-03 14:47:32 -0400 |
| commit | d213f8635b96f7da2b1efc193d48dc8d681e4f3e (patch) | |
| tree | 6112cc0b55747b297fd108ccbd9b4ae1df088a47 /indra/newview/llagent.cpp | |
| parent | d64438c132964721648249a769cbcb4ca6f1dad0 (diff) | |
| parent | 28b71c34020cadaa62603e03e6815008aaceb210 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 0fa77ff7c2..d2e55f88a0 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3585,7 +3585,13 @@ void LLAgent::sendAgentSetAppearance() llinfos << "TAT: Sending cached texture data" << llendl; for (U8 baked_index = 0; baked_index < BAKED_NUM_INDICES; baked_index++) { - LLUUID hash = gAgentWearables.computeBakedTextureHash((EBakedTextureIndex) baked_index); + BOOL generate_valid_hash = TRUE; + if (isAgentAvatarValid() && !gAgentAvatarp->isBakedTextureFinal((LLVOAvatarDefines::EBakedTextureIndex)baked_index)) + { + generate_valid_hash = FALSE; + } + + LLUUID hash = gAgentWearables.computeBakedTextureHash((EBakedTextureIndex) baked_index, generate_valid_hash); if (hash.notNull()) { |