diff options
| author | Tofu Buzzard <no-email> | 2011-03-14 18:18:33 -0700 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-14 18:18:33 -0700 |
| commit | 2d29b51f648e8a006936e9e70cf955b7e493bdfe (patch) | |
| tree | 966345babfafb4423e71956a944a8d858b292294 /indra/llprimitive/llmodel.cpp | |
| parent | 0b51a0cc63b5d6cd848189bf3fc0d26e987c62fb (diff) | |
| parent | ea5cbe9c90afdab366e7db7469a895f45c8746f0 (diff) | |
merge
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rwxr-xr-x | indra/llprimitive/llmodel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 4ce5c15898..2284ca0bee 100755 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -57,6 +57,7 @@ const int MODEL_NAMES_LENGTH = sizeof(model_names) / sizeof(std::string); LLModel::LLModel(LLVolumeParams& params, F32 detail) : LLVolume(params, detail), mNormalizedScale(1,1,1), mNormalizedTranslation(0,0,0) + , mPelvisOffset( 0.0f ) { mDecompID = -1; } @@ -1497,6 +1498,7 @@ LLSD LLModel::writeModel( } } + if ( upload_joints && high->mAlternateBindMatrix.size() > 0 ) { for (U32 i = 0; i < high->mJointList.size(); ++i) @@ -1509,6 +1511,8 @@ LLSD LLModel::writeModel( } } } + + mdl["skin"]["pelvis_offset"] = high->mPelvisOffset; } } |