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/llappearance/llwearabledata.cpp | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
| parent | 5f513242890068f569df7e50a5ac0ba3bdd23f05 (diff) | |
merge with release
Diffstat (limited to 'indra/llappearance/llwearabledata.cpp')
| -rw-r--r-- | indra/llappearance/llwearabledata.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp index 68fdcca782..089370dbc4 100644 --- a/indra/llappearance/llwearabledata.cpp +++ b/indra/llappearance/llwearabledata.cpp @@ -75,13 +75,13 @@ void LLWearableData::setWearable(const LLWearableType::EType type, U32 index, LL wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type); if (wearable_iter == mWearableDatas.end()) { - llwarns << "invalid type, type " << type << " index " << index << llendl; + LL_WARNS() << "invalid type, type " << type << " index " << index << LL_ENDL; return; } wearableentry_vec_t& wearable_vec = wearable_iter->second; if (index>=wearable_vec.size()) { - llwarns << "invalid index, type " << type << " index " << index << llendl; + LL_WARNS() << "invalid index, type " << type << " index " << index << LL_ENDL; } else { @@ -99,7 +99,7 @@ U32 LLWearableData::pushWearable(const LLWearableType::EType type, if (wearable == NULL) { // no null wearables please! - llwarns << "Null wearable sent for type " << type << llendl; + LL_WARNS() << "Null wearable sent for type " << type << LL_ENDL; return MAX_CLOTHING_PER_TYPE; } if (type < LLWearableType::WT_COUNT || mWearableDatas[type].size() < MAX_CLOTHING_PER_TYPE) @@ -221,7 +221,7 @@ U32 LLWearableData::getWearableIndex(const LLWearable *wearable) const wearableentry_map_t::const_iterator wearable_iter = mWearableDatas.find(type); if (wearable_iter == mWearableDatas.end()) { - llwarns << "tried to get wearable index with an invalid type!" << llendl; + LL_WARNS() << "tried to get wearable index with an invalid type!" << LL_ENDL; return MAX_CLOTHING_PER_TYPE; } const wearableentry_vec_t& wearable_vec = wearable_iter->second; |