diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
index 6e31923ad7bad391fe07c1b2f81574592c7db48d..13130f3fa1fc26ff192e97091a0629426ab4d243 100644
--- a/indra/llcharacter/llmotioncontroller.h
+++ b/indra/llcharacter/llmotioncontroller.h
@@ -144,7 +144,7 @@ public:
 	void pauseAllMotions();
 	void unpauseAllMotions();
 	BOOL isPaused() const { return mPaused; }
-    S32 getPausedFrame() const { return mPausedFrame; }
+    U64 getPausedFrame() const { return mPausedFrame; }
 
 	void setTimeStep(F32 step);
     F32 getTimeStep() const { return mTimeStep; }
@@ -218,7 +218,7 @@ protected:
 	F32					mLastTime;
 	BOOL				mHasRunOnce;
 	BOOL				mPaused;
-	S32					mPausedFrame;
+	U64					mPausedFrame;
 	F32					mTimeStep;
 	S32					mTimeStepCount;
 	F32					mLastInterp;
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp
index b9a7ede28df36f94a165eb83fe008ac7f6427a15..57c612703de0ae9281b2013e33e8779c3387cdef 100644
--- a/indra/llcommon/llframetimer.cpp
+++ b/indra/llcommon/llframetimer.cpp
@@ -37,7 +37,7 @@ U64 LLFrameTimer::sStartTotalTime = totalTime();
 F64 LLFrameTimer::sFrameTime = 0.0;
 U64 LLFrameTimer::sTotalTime = 0;
 F64 LLFrameTimer::sTotalSeconds = 0.0;
-S32 LLFrameTimer::sFrameCount = 0;
+U64 LLFrameTimer::sFrameCount = 0;
 U64 LLFrameTimer::sFrameDeltaTime = 0;
 const F64 USEC_TO_SEC_F64 = 0.000001;
 
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h
index 81bd5da8a3e79e91bf69c61e6d3893a0dc5a9f7b..001268a5137b823b6423b10d6ea75168c48251b1 100644
--- a/indra/llcommon/llframetimer.h
+++ b/indra/llcommon/llframetimer.h
@@ -68,7 +68,7 @@ public:
 	// Call this method once, and only once, per frame to update the current frame count.
 	static void updateFrameCount()					{ sFrameCount++; }
 
-	static U32  getFrameCount()						{ return sFrameCount; }
+	static U64  getFrameCount()						{ return sFrameCount; }
 
 	static F32	getFrameDeltaTimeF32();
 
@@ -127,7 +127,7 @@ protected:
 	static F64 sTotalSeconds;
 
 	// Total number of frames elapsed in application
-	static S32 sFrameCount;
+	static U64 sFrameCount;
 
 	//
 	// Member data
diff --git a/indra/llcommon/llkeythrottle.h b/indra/llcommon/llkeythrottle.h
index 41eb0e666482a6e1609198ff4631634fbe8eebe2..a6995b87afcc8d3d025b0b499317884b723ff621 100644
--- a/indra/llcommon/llkeythrottle.h
+++ b/indra/llcommon/llkeythrottle.h
@@ -82,7 +82,7 @@ protected:
 	}
 	static U64 getFrame()		// Return the current frame number
 	{
-		return (U64) LLFrameTimer::getFrameCount();
+		return LLFrameTimer::getFrameCount();
 	}
 };
 
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index e962c535766f9ebea7bf33545dad175762b1808c..ffc20bfe51e53981bdc9307a24d5a74291ddfacd 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -200,7 +200,7 @@ void LLXferManager::updateHostStatus()
 			<< " is " << xferp->mXferSize << " bytes"
 			<< ", status " << (S32)(xferp->mStatus)
 			<< ", waiting for ACK: " << (S32)(xferp->mWaitingForACK)
-			<< " in frame " << (S32) LLFrameTimer::getFrameCount()
+			<< " in frame " << LLFrameTimer::getFrameCount()
 			<< LL_ENDL;
 	}
 
@@ -211,7 +211,7 @@ void LLXferManager::updateHostStatus()
 			<< " has " << (*iter)->mNumActive
 			<< " active, " << (*iter)->mNumPending
 			<< " pending" 
-			<< " in frame " << (S32) LLFrameTimer::getFrameCount()
+			<< " in frame " << LLFrameTimer::getFrameCount()
 			<< LL_ENDL;
 	}
 #endif // LL_XFER_DIAGNOISTIC_LOGGING
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 883733ee93ce115da7f850a094840af03253e9af..608812643b4ceba990d35fe84ac33edf0d505811 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -453,7 +453,7 @@ BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
 		if(mMouseDownSignal) (*mMouseDownSignal)(this, LLSD());
 
 		mMouseDownTimer.start();
-		mMouseDownFrame = (S32) LLFrameTimer::getFrameCount();
+		mMouseDownFrame = LLFrameTimer::getFrameCount();
 		mMouseHeldDownCount = 0;
 
 		
@@ -589,7 +589,7 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
 		if (mMouseDownTimer.getStarted())
 		{
 			F32 elapsed = getHeldDownTime();
-			if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= (S32)LLFrameTimer::getFrameCount() - mMouseDownFrame)
+			if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= LLFrameTimer::getFrameCount() - mMouseDownFrame)
 			{
 				LLSD param;
 				param["count"] = mMouseHeldDownCount++;
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 007f2405e89c7e1afba82a26e8b8da0fe79a2c45..f2a9031ff503b4cef33767e1d6a5efb989315d71 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -300,7 +300,7 @@ protected:
 	
 	const LLFontGL*				mGLFont;
 	
-	S32							mMouseDownFrame;
+	U64							mMouseDownFrame;
 	S32 						mMouseHeldDownCount; 	// Counter for parameter passed to held-down callback
 	F32							mHeldDownDelay;			// seconds, after which held-down callbacks get called
 	S32							mHeldDownFrameDelay;	// frames, after which held-down callbacks get called
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index a554f2fd072ccb18cfe770e1310434c2ca8da600..ac698c1447cff9413d772b7d3f3847859c90160a 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -607,7 +607,7 @@ private:
 
 	LLViewerMediaImpl* mMediaImplp ;	
 	BOOL mIsPlaying ;
-	U32  mUpdateVirtualSizeTime ;
+	U64  mUpdateVirtualSizeTime ;
 
 public:
 	static void updateClass() ;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 5547cd180af59c7422bac08dc349e62262382360..4c304cee508b56fe7669d538553da3671ead0fe9 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4781,7 +4781,7 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
         bool is_paused = avatar && avatar->areAnimationsPaused();
 		if (is_paused)
 		{
-            S32 frames_paused = LLFrameTimer::getFrameCount() - avatar->getMotionController().getPausedFrame();
+            U64 frames_paused = LLFrameTimer::getFrameCount() - avatar->getMotionController().getPausedFrame();
             if (frames_paused > 2)
             {
                 return;