diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
commit | 04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch) | |
tree | b0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/llprimitive/llmaterialtable.cpp | |
parent | aaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff) | |
parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) |
merge.
Diffstat (limited to 'indra/llprimitive/llmaterialtable.cpp')
-rw-r--r-- | indra/llprimitive/llmaterialtable.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp index 18787c47c5..774a58c8ac 100644 --- a/indra/llprimitive/llmaterialtable.cpp +++ b/indra/llprimitive/llmaterialtable.cpp @@ -92,6 +92,9 @@ F32 const LLMaterialTable::DEFAULT_FRICTION = 0.5f; F32 const LLMaterialTable::DEFAULT_RESTITUTION = 0.4f; LLMaterialTable::LLMaterialTable() + : mCollisionSoundMatrix(NULL), + mSlidingSoundMatrix(NULL), + mRollingSoundMatrix(NULL) { } |