diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-03 11:08:49 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-03 11:08:49 -0400 |
| commit | 22795e0a8da1bd99a5bb0e4df62b684eb2fc3931 (patch) | |
| tree | 472541be51deee84995bc31d878c2ab26c0247fc /indra/llprimitive | |
| parent | 93e3d9e2ec0cc06cbc378ffcf23e66ed569db5f3 (diff) | |
| parent | 174e44ab1eec203b5bc26a463d40b6eaf7ac58df (diff) | |
merge
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmaterialtable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp index 99f32e4109..b4539ebee9 100644 --- a/indra/llprimitive/llmaterialtable.cpp +++ b/indra/llprimitive/llmaterialtable.cpp @@ -538,7 +538,7 @@ std::string LLMaterialTable::getName(U8 mcode) } } - return NULL; + return std::string(); } |