diff options
author | simon <none@none> | 2014-05-07 15:28:13 -0700 |
---|---|---|
committer | simon <none@none> | 2014-05-07 15:28:13 -0700 |
commit | a5568f942b449e48cad71e92acd67eaa22dd5e5d (patch) | |
tree | f266b99c9663fda8001cbde48aa5a6b1b9d7db68 /indra/newview/llcofwearables.cpp | |
parent | 80a134ffcc68b277c10cc79dc9c7ca073148b41e (diff) | |
parent | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (diff) |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/newview/llcofwearables.cpp')
-rwxr-xr-x | indra/newview/llcofwearables.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp index e200e0ee9e..8ce5aca909 100755 --- a/indra/newview/llcofwearables.cpp +++ b/indra/newview/llcofwearables.cpp @@ -382,14 +382,14 @@ void LLCOFWearables::refresh() const LLUUID cof_id = LLAppearanceMgr::instance().getCOF(); if (cof_id.isNull()) { - llwarns << "COF ID cannot be NULL" << llendl; + LL_WARNS() << "COF ID cannot be NULL" << LL_ENDL; return; } LLViewerInventoryCategory* catp = gInventory.getCategory(cof_id); if (!catp) { - llwarns << "COF category cannot be NULL" << llendl; + LL_WARNS() << "COF category cannot be NULL" << LL_ENDL; return; } @@ -477,7 +477,7 @@ void LLCOFWearables::populateAttachmentsAndBodypartsLists(const LLInventoryModel { for (U32 i = 0; i < cof_items.size(); ++i) { - LLViewerInventoryItem* item = cof_items.get(i); + LLViewerInventoryItem* item = cof_items.at(i); if (!item) continue; const LLAssetType::EType item_type = item->getType(); |