livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Brad Payne (Vir Linden) 2016-10-19 11:05:02 -04:00
parent 0200135224
commit 45ab1429b2
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llprimitive/llmodel.cpp
View File

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

2
indra/llprimitive/llmodel.h
View File

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