From 391ac367d6922f30bf3a186bc15e1fc38366eecf Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 19 Nov 2013 17:40:44 -0800
Subject: SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer
 renamed fast timers to have unique names, changes instance tracker to never
 allow duplicates

---
 indra/newview/llfolderviewmodelinventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llfolderviewmodelinventory.cpp')

diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index 0dc667f9f5..f128910ca7 100755
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -34,7 +34,7 @@
 //
 // class LLFolderViewModelInventory
 //
-static LLTrace::BlockTimerStatHandle FTM_INVENTORY_SORT("Sort");
+static LLTrace::BlockTimerStatHandle FTM_INVENTORY_SORT("Inventory Sort");
 
 bool LLFolderViewModelInventory::startDrag(std::vector<LLFolderViewModelItem*>& items)
 {
-- 
cgit v1.2.3