diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-15 11:40:15 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-15 11:40:15 -0400 |
| commit | 27d34b5707934438e2363b5e8702bbbaedb3e2b6 (patch) | |
| tree | 6c2a3acb48ac377252226be529e6b0409e6e2650 /indra/llprimitive/llmodel.cpp | |
| parent | 01600af612df4421a7f095a67db2f135da9fe161 (diff) | |
| parent | 16ff50719055aae202011e4b20aeae41d98493fa (diff) | |
Automated merge from mesh-development
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 a9101378a4..eed82f924b 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; } } |