diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
| commit | d4462963c6ba5db2088723bbedc7b60f1184c594 (patch) | |
| tree | 34aaba4b31f93388b0ce3b2b36e9c49823bec2cf /indra/llui/llview.h | |
| parent | b53c377727d216cb277ba14ba4c73b9b9bb96b32 (diff) | |
merge -r 58503:58641 maintenance -> release
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 839c300476..b794c087b5 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -145,7 +145,6 @@ protected: public: LLViewHandle mViewHandle; BOOL mLastVisible; - BOOL mRenderInFastFrame; BOOL mSpanChildren; private: @@ -161,7 +160,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; @@ -319,8 +317,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); @@ -418,8 +416,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); |