diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:27:03 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:27:03 -0800 |
| commit | a5ae6f0141a6f80cd21ab4f583fc9f1b5264c5a4 (patch) | |
| tree | 979cf6697a27f09072bf404a471a4712c2dca912 /indra/newview/llmeshrepository.cpp | |
| parent | a1e59112d028469870c7d1b38c8dbb56f556959d (diff) | |
| parent | 1be5133116c7e63bc621a4017bedaebf557c83db (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 6d117c8c39..0ee0d8393e 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2622,6 +2622,12 @@ void LLMeshRepository::buildHull(const LLVolumeParams& params, S32 detail) LLPrimitive::sVolumeManager->unrefVolume(volume); } +bool LLMeshRepository::hasPhysicsShape(const LLUUID& mesh_id) +{ + LLSD mesh = mThread->getMeshHeader(mesh_id); + return mesh.has("physics_shape") && mesh["physics_shape"].has("size") && (mesh["physics_shape"]["size"].asInteger() > 0); +} + const LLSD& LLMeshRepository::getMeshHeader(const LLUUID& mesh_id) { return mThread->getMeshHeader(mesh_id); |