diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-05 15:13:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-05 15:13:48 -0400 |
| commit | f7c9739fd9bb4355765ecff4b92e879b38302e49 (patch) | |
| tree | cf56bff8f717753c212a4d1e2777fca8839231c9 /indra/llinventory/llinventory.cpp | |
| parent | 63940048eff9c9a1929574ba7581f4c835af35d3 (diff) | |
SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived.
Diffstat (limited to 'indra/llinventory/llinventory.cpp')
| -rwxr-xr-x | indra/llinventory/llinventory.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index a529aa3af3..77b837f8ac 100755 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -50,6 +50,7 @@ static const std::string INV_DESC_LABEL("desc"); static const std::string INV_PERMISSIONS_LABEL("permissions"); static const std::string INV_SHADOW_ID_LABEL("shadow_id"); static const std::string INV_ASSET_ID_LABEL("asset_id"); +static const std::string INV_LINKED_ID_LABEL("linked_id"); static const std::string INV_SALE_INFO_LABEL("sale_info"); static const std::string INV_FLAGS_LABEL("flags"); static const std::string INV_CREATION_DATE_LABEL("created_at"); @@ -1109,6 +1110,11 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd) { mAssetUUID = sd[w]; } + w = INV_LINKED_ID_LABEL; + if (sd.has(w)) + { + mAssetUUID = sd[w]; + } w = INV_ASSET_TYPE_LABEL; if (sd.has(w)) { |