diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-08-14 17:13:46 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-08-14 17:13:46 -0400 |
| commit | 48b7eff75835058f144bbc27a5b2ef2997be2be4 (patch) | |
| tree | 53cc38357834b0f1b12e9689b77c99c85ed70a64 /indra/newview/llagent.cpp | |
| parent | 5ee461ab19ac86ef9712ad33435b821f9afe340c (diff) | |
| parent | e7a63cb356d49925131edfadb5a0e8d5368a9096 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/sunshine
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 698f89ef26..2379c23969 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4260,7 +4260,7 @@ void LLAgent::requestLeaveGodMode() //----------------------------------------------------------------------------- void LLAgent::sendAgentSetAppearance() { - if (!isAgentAvatarValid() || LLAppearanceMgr::instance().useServerTextureBaking()) return; + if (!isAgentAvatarValid() || (getRegion() && getRegion()->getCentralBakeVersion())) return; if (gAgentQueryManager.mNumPendingQueries > 0 && (isAgentAvatarValid() && gAgentAvatarp->isUsingBakedTextures())) { |