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/newview/llmeshrepository.cpp | |
| parent | 01600af612df4421a7f095a67db2f135da9fe161 (diff) | |
| parent | 16ff50719055aae202011e4b20aeae41d98493fa (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index e259ee9846..8e869b2d5b 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1162,7 +1162,12 @@ bool LLMeshRepoThread::skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 dat info.mAlternateBindMatrix.push_back(mat); } } - + + if (skin.has("pelvis_offset")) + { + info.mPelvisOffset = skin["pelvis_offset"].asReal(); + } + mSkinInfoQ.push(info); } |