Fix for ruthing in non-server-bake regions

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;
 	}