diff options
| author | Don Kjer <don@lindenlab.com> | 2013-03-04 12:02:02 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-03-04 12:02:02 -0800 |
| commit | 2efe411a4fd8d76e9a153ed4aad9235819738328 (patch) | |
| tree | 9cd75780db5affe4f732d8e8e027d554eb9baf9a /indra/newview | |
| parent | ec1bc19d01715299209d9f00230e4681917bde12 (diff) | |
Reducing amount of cof link data sent to appearance update service. Allowing links to items with 'null' asset ids to be passed
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 2cebf6863e..fa239e2c8a 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3184,13 +3184,10 @@ LLSD LLAppearanceMgr::dumpCOF() const const LLViewerInventoryItem* inv_item = item_array.get(i).get(); LLSD item; LLUUID item_id(inv_item->getUUID()); - item["item_id"] = item_id; md5.update((unsigned char*)item_id.mData, 16); - item["name"] = inv_item->getName(); item["description"] = inv_item->getActualDescription(); md5.update(inv_item->getActualDescription()); item["asset_type"] = inv_item->getActualType(); - item["inv_type"] = inv_item->getInventoryType(); LLUUID linked_id(inv_item->getLinkedUUID()); item["linked_id"] = linked_id; md5.update((unsigned char*)linked_id.mData, 16); @@ -3205,19 +3202,17 @@ LLSD LLAppearanceMgr::dumpCOF() const << ") during requestServerAppearanceUpdate" << llendl; continue; } - if (linked_item->getAssetUUID().isNull()) - { - llwarns << "Broken link (null asset) for item '" << inv_item->getName() - << "' (" << inv_item->getUUID() - << ") during requestServerAppearanceUpdate" << llendl; - continue; - } + // Some assets may be 'hidden' and show up as null in the viewer. + //if (linked_item->getAssetUUID().isNull()) + //{ + // llwarns << "Broken link (null asset) for item '" << inv_item->getName() + // << "' (" << inv_item->getUUID() + // << ") during requestServerAppearanceUpdate" << llendl; + // continue; + //} LLUUID linked_asset_id(linked_item->getAssetUUID()); - item["linked_asset_id"] = linked_asset_id; md5.update((unsigned char*)linked_asset_id.mData, 16); - item["linked_asset_type"] = linked_item->getType(); U32 flags = linked_item->getFlags(); - item["linked_flags"] = LLSD::Integer(flags); md5.update(boost::lexical_cast<std::string>(flags)); } else if (LLAssetType::AT_LINK_FOLDER != inv_item->getActualType()) |