Merge.

2017-03-14 04:02:53 -05:00
parent 4a9ff22eeb
commit f4a713a500
99 changed files with 1010 additions and 989 deletions
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -269,7 +269,7 @@ public:
 	~LLMutex()
 	{}

-	void lock(LLFastTimer::DeclareTimer* timer = NULL)	// blocks
+	void lock(LLTrace::BlockTimerStatHandle* timer = NULL)	// blocks
 	{
 		if (inc_lock_if_recursive())
 			return;
@@ -384,7 +384,7 @@ public:
 #endif

 private:
-	void lock_main(LLFastTimer::DeclareTimer* timer);
+	void lock_main(LLTrace::BlockTimerStatHandle* timer);

 	bool inc_lock_if_recursive()
 	{