diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 19:55:36 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-03 19:55:36 +0100 |
| commit | 4d586d48ff3f6f10a159758af6dedccaf2e8543b (patch) | |
| tree | 80863a30bed7aaeac49b9d996e462e05d95068ee /indra/newview/llagent.cpp | |
| parent | 3d439157dda9600c95e0321e829b3eda9004755b (diff) | |
| parent | d213f8635b96f7da2b1efc193d48dc8d681e4f3e (diff) | |
merge from viewer-public
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()) { |