diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-10-04 10:38:58 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-10-04 10:38:58 -0400 |
| commit | bf7e1bb2d2b78d5f49c8c2276308646ce4854a29 (patch) | |
| tree | 3036fa9bd43b3a769c7854ce212780b6b1202356 /indra/llprimitive | |
| parent | 1ead58914837f12e943ff1db4b71cd3ed379d01c (diff) | |
| parent | d0e36ade5bb16e9e5a6aca9ee4f02fbe995cdfd8 (diff) | |
Merged
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(); } |