diff options
| author | Richard Linden <none@none> | 2013-09-05 14:04:13 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-05 14:04:13 -0700 |
| commit | cbe397ad13665c7bc993e10d8fe1e4a876253378 (patch) | |
| tree | 52cd665a1138a65bd8ebfc94478c665ea40b2e25 /indra/llinventory | |
| parent | 12688c8b549d2baa33509dca60bbe14b039b17db (diff) | |
changed fast timer over to using macro
another attempt to move mem stat into base class
Diffstat (limited to 'indra/llinventory')
| -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; |