diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
| commit | ce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch) | |
| tree | f9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/llinventory | |
| parent | 4fb809eed5fbed458b5be883fba7196a5712aa48 (diff) | |
| parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (diff) | |
Merge.
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; |