From 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:50 -0500
Subject: Second Life viewer sources 1.14.0.0

---
 linden/indra/llui/llview.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'linden/indra/llui/llview.h')

diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 268f157..3885789 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -164,7 +164,6 @@ protected:
 public:
 	LLViewHandle mViewHandle;
 	BOOL		mLastVisible;
-	BOOL		mRenderInFastFrame;
 	BOOL		mSpanChildren;
 
 private:
@@ -180,7 +179,6 @@ public:
 	static BOOL	sDebugRects;	// Draw debug rects behind everything.
 	static BOOL sDebugKeys;
 	static S32	sDepth;
-	static LLView* sFastFrameView;
 	static BOOL sDebugMouseHandling;
 	static LLString sMouseHandlerMessage;
 	static S32	sSelectID;
@@ -338,8 +336,8 @@ public:
 	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
 	virtual void	translate( S32 x, S32 y );
+	virtual void	setOrigin( S32 x, S32 y )	{ mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); }
 	BOOL			translateIntoRect( const LLRect& constraint, BOOL allow_partial_outside );
-	void			setOrigin( S32 x, S32 y )	{ mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); }
 	LLView*			findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0);
 	LLView*			findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0);
 
@@ -437,8 +435,6 @@ public:
 	virtual void	localRectToScreen( const LLRect& local, LLRect* screen ) const;
 	virtual BOOL	localRectToOtherView( const LLRect& local, LLRect* other, LLView* other_view ) const;
 
-	void			setRenderInFastFrame(BOOL render) { mRenderInFastFrame = render; }
-	virtual LLView*	getRootMostFastFrameView();
 
 	static LLWindow*	getWindow(void);
 
-- 
cgit v1.1