diff options
| author | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
| commit | c6b6ae7a45f7ab473dd839515a1717bae68af03a (patch) | |
| tree | 74bc548852a9ea3cf350096b55182761362a3f6d /indra/llinventory/llinventory.cpp | |
| parent | 3fd68662f267a3fd96d101834b3a9563bde3f61e (diff) | |
| parent | e4cacda5a0cf3918bdc8091997b988235e9d4f3d (diff) | |
merge
Diffstat (limited to 'indra/llinventory/llinventory.cpp')
| -rwxr-xr-x | indra/llinventory/llinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 38e01593ca..d2efda8612 100755 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -1049,11 +1049,11 @@ void LLInventoryItem::asLLSD( LLSD& sd ) const sd[INV_CREATION_DATE_LABEL] = (S32) mCreationDate; } -LLFastTimer::DeclareTimer FTM_INVENTORY_SD_DESERIALIZE("Inventory SD Deserialize"); +LLTrace::TimeBlock FTM_INVENTORY_SD_DESERIALIZE("Inventory SD Deserialize"); bool LLInventoryItem::fromLLSD(const LLSD& sd) { - LLFastTimer _(FTM_INVENTORY_SD_DESERIALIZE); + LL_RECORD_BLOCK_TIME(FTM_INVENTORY_SD_DESERIALIZE); mInventoryType = LLInventoryType::IT_NONE; mAssetUUID.setNull(); std::string w; |