SL-395 - believed fix for intermittent problem uploading meshes with scale locks

indra/llprimitive/llmodel.cpp

@@ -1343,7 +1343,6 @@ bool LLModel::matchMaterialOrder(LLModel* ref, int& refFaceCnt, int& modelFaceCn
 	return true;
 }
 
-
 bool LLModel::loadSkinInfo(LLSD& header, std::istream &is)
 {
 	S32 offset = header["skin"]["offset"].asInteger();
@@ -1386,8 +1385,15 @@ bool LLModel::loadDecomposition(LLSD& header, std::istream& is)
 	return true;
 }
 
+LLMeshSkinInfo::LLMeshSkinInfo():
+    mPelvisOffset(0.0),
+    mLockScaleIfJointPosition(false)
+{
+}
 
-LLMeshSkinInfo::LLMeshSkinInfo(LLSD& skin)
+LLMeshSkinInfo::LLMeshSkinInfo(LLSD& skin):
+    mPelvisOffset(0.0),
+    mLockScaleIfJointPosition(false)
 {
 	fromLLSD(skin);
 }
@@ -1503,7 +1509,7 @@ LLSD LLMeshSkinInfo::asLLSD(bool include_joints, bool lock_scale_if_joint_positi
 
         if (lock_scale_if_joint_position)
         {
-            ret["lock_scale_if_joint_position"] = mLockScaleIfJointPosition;
+            ret["lock_scale_if_joint_position"] = lock_scale_if_joint_position;
         }
 
 		ret["pelvis_offset"] = mPelvisOffset;

indra/llprimitive/llmodel.h

@@ -42,7 +42,7 @@ class domMesh;
 class LLMeshSkinInfo 
 {
 public:
-	LLMeshSkinInfo() { }
+	LLMeshSkinInfo();
 	LLMeshSkinInfo(LLSD& data);
 	void fromLLSD(LLSD& data);
 	LLSD asLLSD(bool include_joints, bool lock_scale_if_joint_position) const;