diff options
| author | Tofu Buzzard <no-email> | 2011-03-14 18:18:20 -0700 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-14 18:18:20 -0700 |
| commit | ea5cbe9c90afdab366e7db7469a895f45c8746f0 (patch) | |
| tree | 2d99aad3fd4161ad091704a0a1083513d5d60d95 /indra/newview/llmeshrepository.cpp | |
| parent | 41f057b693d1b2b1b1916e3a126dc622a943e5d8 (diff) | |
| parent | 16ff50719055aae202011e4b20aeae41d98493fa (diff) | |
merge
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 a9a8e28b00..fb686fccd7 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); } |