diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2011-09-27 09:32:36 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2011-09-27 09:32:36 -0700 |
| commit | 7d6ea9814e51d818c176dfd5ed9a3ffc0a1737d1 (patch) | |
| tree | 195950fba6d275e71a2113a8d6345b554168c51e /indra/llprimitive/llmaterialtable.cpp | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewed
by Kelly
Diffstat (limited to 'indra/llprimitive/llmaterialtable.cpp')
| -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(); } |