diff options
| author | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
| commit | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (patch) | |
| tree | b61a1aa1775b3faca1baf492a969a51d7ce8b3fe /indra/newview/llfolderviewmodelinventory.cpp | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
| parent | 91850b6cfacb32ed32265ebd37ce7690dd79a0b0 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.cpp')
| -rwxr-xr-x | indra/newview/llfolderviewmodelinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index c28657dbcd..d76d6d422f 100755 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -34,7 +34,7 @@ // // class LLFolderViewModelInventory // -static LLFastTimer::DeclareTimer FTM_INVENTORY_SORT("Sort"); +static LLTrace::TimeBlock FTM_INVENTORY_SORT("Sort"); bool LLFolderViewModelInventory::startDrag(std::vector<LLFolderViewModelItem*>& items) { @@ -63,7 +63,7 @@ bool LLFolderViewModelInventory::startDrag(std::vector<LLFolderViewModelItem*>& void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder ) { - LLFastTimer _(FTM_INVENTORY_SORT); + LL_RECORD_BLOCK_TIME(FTM_INVENTORY_SORT); if (!needsSort(folder->getViewModelItem())) return; |