diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-06-03 14:33:36 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-06-03 14:33:36 -0700 |
| commit | fbee0d8ef1cfd97c2ef52398d19d038c145bae67 (patch) | |
| tree | 9eecdbde01e4cc531169568c70b3859a3c7d5159 /indra/newview/llagent.cpp | |
| parent | 2d93672587e6f5ca46e06d768a1f6f9df4ebac37 (diff) | |
| parent | e2b8c1c699f75e234776beda939205a247fb1bc3 (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()) { |