diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/llprimitive/llmaterialtable.h | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
Diffstat (limited to 'indra/llprimitive/llmaterialtable.h')
| -rw-r--r-- | indra/llprimitive/llmaterialtable.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llmaterialtable.h b/indra/llprimitive/llmaterialtable.h index e84e75c677..7dbe7de917 100644 --- a/indra/llprimitive/llmaterialtable.h +++ b/indra/llprimitive/llmaterialtable.h @@ -79,12 +79,12 @@ public: F32 mDamageModifier; // modifier on KE based damage F32 mEPModifier; // modifier on mass based EP total - LLMaterialInfo(U8 mcode, char* name, const LLUUID &uuid) + LLMaterialInfo(U8 mcode, const char* name, const LLUUID &uuid) { init(mcode,name,uuid); }; - void init(U8 mcode, char* name, const LLUUID &uuid) + void init(U8 mcode, const char* name, const LLUUID &uuid) { mName[0] = 0; mDensity = 1000.f; // default to 1000.0 (water) @@ -150,7 +150,7 @@ public: void initBasicTable(); - BOOL add(U8 mcode, char* name, const LLUUID &uuid); + BOOL add(U8 mcode, const char* name, const LLUUID &uuid); BOOL addCollisionSound(U8 mcode, U8 mcode2, const LLUUID &uuid); BOOL addSlidingSound(U8 mcode, U8 mcode2, const LLUUID &uuid); BOOL addRollingSound(U8 mcode, U8 mcode2, const LLUUID &uuid); |