diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-03 13:23:50 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-03 13:23:50 -0700 |
| commit | 0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (patch) | |
| tree | 25741079cb8edf161b07741decffb43ffa04b144 /indra/llprimitive/llmaterialtable.cpp | |
| parent | 6eb09ab2ae9c90b23c8af1929e7d0a2088a6e76e (diff) | |
| parent | fa3b55e68a00359f8b37b1225337e615b3f6da4d (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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(); } |