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.cpp | |
| parent | b53c377727d216cb277ba14ba4c73b9b9bb96b32 (diff) | |
merge -r 58503:58641 maintenance -> release
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 8c3d2362c5..02a99b00cd 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -32,7 +32,6 @@ BOOL LLView::sDebugRects = FALSE; BOOL LLView::sDebugKeys = FALSE; S32 LLView::sDepth = 0; -LLView* LLView::sFastFrameView = NULL; BOOL LLView::sDebugMouseHandling = FALSE; LLString LLView::sMouseHandlerMessage; S32 LLView::sSelectID = GL_NAME_UI_RESERVED; @@ -93,7 +92,6 @@ LLView::LLView() : mSaveToXML(TRUE), mIsFocusRoot(FALSE), mLastVisible(TRUE), - mRenderInFastFrame(TRUE), mSpanChildren(FALSE), mVisible(TRUE), mHidden(FALSE), @@ -114,7 +112,6 @@ LLView::LLView(const LLString& name, BOOL mouse_opaque) : mSaveToXML(TRUE), mIsFocusRoot(FALSE), mLastVisible(TRUE), - mRenderInFastFrame(TRUE), mSpanChildren(FALSE), mVisible(TRUE), mHidden(FALSE), @@ -138,7 +135,6 @@ LLView::LLView( mSaveToXML(TRUE), mIsFocusRoot(FALSE), mLastVisible(TRUE), - mRenderInFastFrame(TRUE), mSpanChildren(FALSE), mVisible(TRUE), mHidden(FALSE), @@ -180,11 +176,6 @@ LLView::~LLView() mParentView->removeChild(this); } - if(LLView::sFastFrameView == this) - { - LLView::sFastFrameView = NULL; - } - dispatch_list_t::iterator itor; for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor) { @@ -1770,26 +1761,6 @@ void LLView::localRectToScreen(const LLRect& local, LLRect* screen) const } } -LLView* LLView::getRootMostFastFrameView() -{ - if (gFocusMgr.getTopView() == this) - { - return this; - } - - if (getParent()) - { - LLView* rootmost_view = getParent()->getRootMostFastFrameView(); - if (rootmost_view) - { - return rootmost_view; - } - } - - return mRenderInFastFrame ? this : NULL; -} - - LLView* LLView::getRootView() { LLView* view = this; |