diff options
| author | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
| commit | 34ff2fc46ba8c623f0eab8fe1dccb5db327775a8 (patch) | |
| tree | 7bc422dd969e1d18e9d83e52a9a6dcfa2bd6139f /indra/llprimitive/llmaterial.cpp | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
| parent | d8e92867162f8c4ff9489d8eefde53546e907dff (diff) | |
merge with release
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index cf4c645cfd..7f3c8da434 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -69,7 +69,7 @@ template<typename T> T getMaterialField(const LLSD& data, const std::string& fie { return (T)data[field]; } - llerrs << "Missing or mistyped field '" << field << "' in material definition" << llendl; + LL_ERRS() << "Missing or mistyped field '" << field << "' in material definition" << LL_ENDL; return (T)LLSD(); } @@ -80,7 +80,7 @@ template<> LLUUID getMaterialField(const LLSD& data, const std::string& field, c { return data[field].asUUID(); } - llerrs << "Missing or mistyped field '" << field << "' in material definition" << llendl; + LL_ERRS() << "Missing or mistyped field '" << field << "' in material definition" << LL_ENDL; return LLUUID::null; } |