diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-22 15:06:08 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-22 15:06:08 -0400 |
| commit | 75cfa9a0c3c15e3a472a4c4fd2462402a3a766a0 (patch) | |
| tree | 2fef7dcd59fa9ff114b565545023f7451f328b45 /indra/newview/llagent.cpp | |
| parent | 842e5111ae2d0a83755ff902afa43dc84e45662b (diff) | |
EXT-8051 FIXED Change cameraCustomizeAvatar calls to use gAvatarp->isUsingBakedTextures
Changed some uses of cameraCustomizeAvatar as appropriate.
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 72d51540ef..a4bf56fc96 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3075,7 +3075,7 @@ void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void * return; } - if (gAgentCamera.cameraCustomizeAvatar()) + if (isAgentAvatarValid() && !gAgentAvatarp->isUsingBakedTextures()) { // ignore baked textures when in customize mode return; @@ -3544,7 +3544,7 @@ void LLAgent::sendAgentSetAppearance() { if (!isAgentAvatarValid()) return; - if (gAgentQueryManager.mNumPendingQueries > 0 && !gAgentCamera.cameraCustomizeAvatar()) + if (gAgentQueryManager.mNumPendingQueries > 0 && (isAgentAvatarValid() && gAgentAvatarp->isUsingBakedTextures())) { return; } |