summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-27 05:47:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-27 05:47:48 -0400
commit352698140775e62498686f80b5aa21aee85524cf (patch)
tree7b06a14047bfdb4c0da5b6a7b70ba7b297652752 /indra/newview
parenta43d242d00ef06934f9473444297fffe50760f93 (diff)
Fix for ruthing in non-server-bake regions
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerwearable.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp
index bd277349d6..440548046f 100755
--- a/indra/newview/llviewerwearable.cpp
+++ b/indra/newview/llviewerwearable.cpp
@@ -38,6 +38,7 @@
#include "llavatarappearancedefines.h"
#include "llviewerwearable.h"
#include "llviewercontrol.h"
+#include "llviewerregion.h"
using namespace LLAvatarAppearanceDefines;
@@ -322,8 +323,9 @@ void LLViewerWearable::writeToAvatar(LLAvatarAppearance *avatarp)
if (!viewer_avatar->isValid()) return;
- // FIXME restrict this check to server bake regions?
- if (!viewer_avatar->isUsingLocalAppearance())
+ if (viewer_avatar->getRegion() &&
+ (viewer_avatar->getRegion()->getCentralBakeVersion()>0) &&
+ !viewer_avatar->isUsingLocalAppearance())
{
return;
}