diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-09 16:19:50 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-09 16:19:50 -0400 |
| commit | 85b42d94834d5b9b9993c058ca848d6148e1f49b (patch) | |
| tree | c15717fa78981efde46bf86ae70a4fee35d2c01b /indra/newview/llagent.cpp | |
| parent | 228178ac15f60f9b66b72a9d3f13e706d7d6de36 (diff) | |
| parent | a6ad1ba447781f255b5038ee545879dd571321ab (diff) | |
merge
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 939d9398b2..883200c0f5 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4296,7 +4296,7 @@ void LLAgent::sendAgentSetAppearance() return; } - if (!isAgentAvatarValid() || (getRegion() && getRegion()->getCentralBakeVersion())) return; + if (!isAgentAvatarValid() || gAgentAvatarp->isEditingAppearance() || (getRegion() && getRegion()->getCentralBakeVersion())) return; // At this point we have a complete appearance to send and are in a non-baking region. // DRANO FIXME |