diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
| commit | cb957d3dabfd0a419cb70461cc5bf3af2adba7a3 (patch) | |
| tree | ac9978539aa02d80bf8c026aa3b2e1ba85404ecf /indra/llinventory/llinventory.cpp | |
| parent | 7819b49086729187e198bf69f9c45f1c63f11ff2 (diff) | |
| parent | b8320207bb911a311a498426fdd4a987dd7748ea (diff) | |
merge late 3.0.1 beta candidate fixes
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; |