summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-18 17:25:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-18 17:25:48 -0400
commit0325d9060e40bb02794c1cf720188d73db5ca8a6 (patch)
tree4a8e44dbee085cb5157f2befe19e7157177743a2 /indra/llinventory
parente0bf0e3e2150304e7b26c18c274273c18653965b (diff)
parentb2ef0f99882db73680cc5dfb9570255414f7ba6d (diff)
merge
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llinventory.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index a3caf79519..76760aa414 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1034,8 +1034,11 @@ void LLInventoryItem::asLLSD( LLSD& sd ) const
sd[INV_CREATION_DATE_LABEL] = (S32) mCreationDate;
}
+LLFastTimer::DeclareTimer FTM_INVENTORY_SD_DESERIALIZE("Inventory SD Deserialize");
+
bool LLInventoryItem::fromLLSD(const LLSD& sd)
{
+ LLFastTimer _(FTM_INVENTORY_SD_DESERIALIZE);
mInventoryType = LLInventoryType::IT_NONE;
mAssetUUID.setNull();
std::string w;