diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:11:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:11:23 -0400 |
| commit | 2e26a75215bb2d708671d71c5c66e2996c11495f (patch) | |
| tree | c2cdcbf4758462b11f296c9ab200237aa33e5c71 /indra/llprimitive | |
| parent | a69ae967243e19bdc5969c34f0b1e94be794919d (diff) | |
| parent | aabdbeadf53b3a20b4db563a23535af74fd7d4b7 (diff) | |
merge changes for vwr-27090
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(); } |