diff options
| author | Richard Linden <none@none> | 2014-03-12 12:48:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-03-12 12:48:43 -0700 |
| commit | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (patch) | |
| tree | 438dd649dbcc0584709251c6926a476b0db02f85 /indra/llprimitive/lltextureentry.cpp | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
| parent | 5f513242890068f569df7e50a5ac0ba3bdd23f05 (diff) | |
merge with release
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
| -rwxr-xr-x | indra/llprimitive/lltextureentry.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 0db75a0e82..284dfc15f4 100755 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -271,8 +271,8 @@ bool LLTextureEntry::fromLLSD(const LLSD& sd) w = TEXTURE_MEDIA_DATA_KEY; if (hasMedia() != sd.has(w)) { - llwarns << "LLTextureEntry::fromLLSD: media_flags (" << hasMedia() << - ") does not match presence of media_data (" << sd.has(w) << "). Fixing." << llendl; + LL_WARNS() << "LLTextureEntry::fromLLSD: media_flags (" << hasMedia() << + ") does not match presence of media_data (" << sd.has(w) << "). Fixing." << LL_ENDL; } updateMediaData(sd[w]); |