diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
commit | b3641c35fe00ea93887ea8980bf69624c8299267 (patch) | |
tree | 9b575e425986b3f0496192e95009ba2297158de3 /indra/llprimitive/llmaterialtable.cpp | |
parent | 2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff) | |
parent | 244bef7d0cdb75f011f70d8cd834154eeb469088 (diff) |
Merge with default branch
--HG--
branch : product-engine
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) { } |