diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-10 10:53:59 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-10 10:53:59 -0700 |
| commit | e1532afb1267b2012a6fbb9b72b09ab80a85f763 (patch) | |
| tree | e35dbac762939feef4d175f3b133ae9d9f27e0ff /indra/llinventory | |
| parent | 802a063a878a145904d152bed98ac55e7cfecb42 (diff) | |
| parent | 11005a9d917dde208fc0917bb84701d09e1a395e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 3 |
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; |