diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:22:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:22:03 -0400 |
| commit | b8320207bb911a311a498426fdd4a987dd7748ea (patch) | |
| tree | 37c5c4795916fd9787014e9e39727e39727f3482 /indra/llinventory/llinventory.cpp | |
| parent | 45036820f85844093f3a2031cff10c6633926da4 (diff) | |
| parent | 25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff) | |
merge changes for storm-1557
Diffstat (limited to 'indra/llinventory/llinventory.cpp')
| -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; |