aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llview.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llui/llview.h')
-rw-r--r--linden/indra/llui/llview.h6
1 files changed, 1 insertions, 5 deletions
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:
164public: 164public:
165 LLViewHandle mViewHandle; 165 LLViewHandle mViewHandle;
166 BOOL mLastVisible; 166 BOOL mLastVisible;
167 BOOL mRenderInFastFrame;
168 BOOL mSpanChildren; 167 BOOL mSpanChildren;
169 168
170private: 169private:
@@ -180,7 +179,6 @@ public:
180 static BOOL sDebugRects; // Draw debug rects behind everything. 179 static BOOL sDebugRects; // Draw debug rects behind everything.
181 static BOOL sDebugKeys; 180 static BOOL sDebugKeys;
182 static S32 sDepth; 181 static S32 sDepth;
183 static LLView* sFastFrameView;
184 static BOOL sDebugMouseHandling; 182 static BOOL sDebugMouseHandling;
185 static LLString sMouseHandlerMessage; 183 static LLString sMouseHandlerMessage;
186 static S32 sSelectID; 184 static S32 sSelectID;
@@ -338,8 +336,8 @@ public:
338 virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); 336 virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
339 337
340 virtual void translate( S32 x, S32 y ); 338 virtual void translate( S32 x, S32 y );
339 virtual void setOrigin( S32 x, S32 y ) { mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); }
341 BOOL translateIntoRect( const LLRect& constraint, BOOL allow_partial_outside ); 340 BOOL translateIntoRect( const LLRect& constraint, BOOL allow_partial_outside );
342 void setOrigin( S32 x, S32 y ) { mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); }
343 LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0); 341 LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0);
344 LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0); 342 LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0);
345 343
@@ -437,8 +435,6 @@ public:
437 virtual void localRectToScreen( const LLRect& local, LLRect* screen ) const; 435 virtual void localRectToScreen( const LLRect& local, LLRect* screen ) const;
438 virtual BOOL localRectToOtherView( const LLRect& local, LLRect* other, LLView* other_view ) const; 436 virtual BOOL localRectToOtherView( const LLRect& local, LLRect* other, LLView* other_view ) const;
439 437
440 void setRenderInFastFrame(BOOL render) { mRenderInFastFrame = render; }
441 virtual LLView* getRootMostFastFrameView();
442 438
443 static LLWindow* getWindow(void); 439 static LLWindow* getWindow(void);
444 440