diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
| commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
| tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/llprimitive/llmaterialtable.cpp | |
| parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
| parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) | |
automated 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) { } |