diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 16:09:11 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 16:09:11 -0800 |
commit | 6d9713e8ed691882180c85e60070d80e1e3eed5e (patch) | |
tree | a9737f254ef00900ec40120b020621ad64e198c3 /indra/llprimitive/llmaterialtable.cpp | |
parent | 0bb7a85d06e7201887962000cb3e91bf456ffa09 (diff) | |
parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) |
merge from viewer2.
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) { } |