3 files changed, 12 insertions, 14 deletions
diff --git a/indra/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp
index 7444115aa1..23ede97af3 100644
--- a/indra/llcommon/llcursortypes.cpp
+++ b/indra/llcommon/llcursortypes.cpp
@@ -30,6 +30,8 @@
  * $/LicenseInfo$
  */
 
+#include "linden_common.h"
+
 #include "llcursortypes.h"
 
 ECursorType getCursorFromString(const std::string& cursor_string)
@@ -66,10 +68,6 @@ ECursorType getCursorFromString(const std::string& cursor_string)
 		cursor_string_table["UI_CURSOR_TOOLPAN"] = UI_CURSOR_TOOLPAN;
 		cursor_string_table["UI_CURSOR_TOOLZOOMIN"] = UI_CURSOR_TOOLZOOMIN;
 		cursor_string_table["UI_CURSOR_TOOLPICKOBJECT3"] = UI_CURSOR_TOOLPICKOBJECT3;
-		cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT;
-		cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY;
-		cursor_string_table["UI_CURSOR_TOOLPAY"] = UI_CURSOR_TOOLPAY;
-		cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN;
 		cursor_string_table["UI_CURSOR_TOOLPLAY"] = UI_CURSOR_TOOLPLAY;
 		cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE;
 		cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN;
diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h
index bea70351b7..35dbeaf16e 100644
--- a/indra/llcommon/llcursortypes.h
+++ b/indra/llcommon/llcursortypes.h
@@ -33,8 +33,6 @@
 #ifndef LL_LLCURSORTYPES_H
 #define LL_LLCURSORTYPES_H
 
-#include "linden_common.h"
-
 // If you add types here, add them in LLCursor::getCursorFromString
 enum ECursorType {
 	UI_CURSOR_ARROW,
@@ -66,10 +64,6 @@ enum ECursorType {
 	UI_CURSOR_TOOLPAN,
 	UI_CURSOR_TOOLZOOMIN,
 	UI_CURSOR_TOOLPICKOBJECT3,
-	UI_CURSOR_TOOLSIT,
-	UI_CURSOR_TOOLBUY,
-	UI_CURSOR_TOOLPAY,
-	UI_CURSOR_TOOLOPEN,
 	UI_CURSOR_TOOLPLAY,
 	UI_CURSOR_TOOLPAUSE,
 	UI_CURSOR_TOOLMEDIAOPEN,
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 0d89353dee..c2f23f6ff6 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -114,8 +114,9 @@ public:
 		// recursive call to gather total time from children
 		static void accumulateTimings();
 
-		// called once per frame by LLFastTimer
-		static void processFrame();
+		// updates cumulative times and hierarchy, 
+		// can be called multiple times in a frame, at any point
+		static void processTimes();
 
 		static void buildHierarchy();
 		static void resetFrame();
@@ -178,8 +179,9 @@ public:
 	{
 #if FAST_TIMER_ON
 		NamedTimer::FrameState* frame_state = mFrameState;
-		frame_state->mLastStartTime = get_cpu_clock_count();
-		mStartSelfTime = frame_state->mLastStartTime;
+		U64 cur_time = get_cpu_clock_count();
+		frame_state->mLastStartTime = cur_time;
+		mStartSelfTime = cur_time;
 
 		frame_state->mActiveCount++;
 		frame_state->mCalls++;
@@ -215,6 +217,10 @@ public:
 	// call this once a frame to reset timers
 	static void nextFrame();
 
+	// dumps current cumulative frame stats to log
+	// call nextFrame() to reset timers
+	static void dumpCurTimes(); 
+
 	// call this to reset timer hierarchy, averages, etc.
 	static void reset();