From 7d6ea9814e51d818c176dfd5ed9a3ffc0a1737d1 Mon Sep 17 00:00:00 2001 From: "simon@Simon-PC.lindenlab.com" Date: Tue, 27 Sep 2011 09:32:36 -0700 Subject: ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewed by Kelly --- indra/llprimitive/llmaterialtable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llprimitive/llmaterialtable.cpp') 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(); } -- cgit v1.2.3