From 4a6bacea0f8dcff959028f285bc533852da608b5 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 28 Aug 2008 23:57:41 +0000
Subject: merge viewer/viewer_1-21 94170-94770 -> release merge
 viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme
 for viewer + server Release Notes on the wiki! QAR-797 teleport failures
 (DEV-6198 / SVC-972) mergeme

---
 indra/newview/llagent.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llagent.h')

diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index db7fafbba8..851c47cbd5 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -792,7 +792,8 @@ private:
 	LLVector3		mSitCameraPos;					// root relative camera pos when sitting
 	LLVector3		mSitCameraFocus;				// root relative camera target when sitting
 	LLVector3d      mCameraSmoothingLastPositionGlobal;    
-	LLVector3d      mCameraSmoothingLastPositionAgent;    
+	LLVector3d      mCameraSmoothingLastPositionAgent;
+	BOOL            mCameraSmoothingStop;
 
 	
 	//Ventrella
-- 
cgit v1.2.3