From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 2 Mar 2007 21:25:50 +0000
Subject: merge release@58699 beta-1-14-0@58707 -> release

---
 indra/newview/llselectmgr.h | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 2b1568fb45..c0ddad41eb 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -210,6 +210,7 @@ public:
 	virtual BOOL canDuplicate();
 
 	void updateEffects(); // Update HUD effects
+	void overrideObjectUpdates();
 
 	void setForceSelection(BOOL force) { mForceSelection = force; }
 
@@ -580,9 +581,12 @@ public:
 	LLCategory		mCategory;
 	S16				mInventorySerial;
 	LLVector3		mSavedPositionLocal;	// for interactively modifying object position
+	LLVector3		mLastPositionLocal;
 	LLVector3d		mSavedPositionGlobal;	// for interactively modifying object position
 	LLVector3		mSavedScale;			// for interactively modifying object scale
+	LLVector3		mLastScale;
 	LLQuaternion	mSavedRotation;			// for interactively modifying object rotation
+	LLQuaternion	mLastRotation;
 	BOOL			mDuplicated;
 	LLVector3d		mDuplicatePos;
 	LLQuaternion	mDuplicateRot;
-- 
cgit v1.3