aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/llui/llview.cpp
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/llui/llview.cpp')
-rw-r--r--linden/indra/llui/llview.cpp29
1 files changed, 0 insertions, 29 deletions
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index ab06c0f..13f1ddc 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -51,7 +51,6 @@
51BOOL LLView::sDebugRects = FALSE; 51BOOL LLView::sDebugRects = FALSE;
52BOOL LLView::sDebugKeys = FALSE; 52BOOL LLView::sDebugKeys = FALSE;
53S32 LLView::sDepth = 0; 53S32 LLView::sDepth = 0;
54LLView* LLView::sFastFrameView = NULL;
55BOOL LLView::sDebugMouseHandling = FALSE; 54BOOL LLView::sDebugMouseHandling = FALSE;
56LLString LLView::sMouseHandlerMessage; 55LLString LLView::sMouseHandlerMessage;
57S32 LLView::sSelectID = GL_NAME_UI_RESERVED; 56S32 LLView::sSelectID = GL_NAME_UI_RESERVED;
@@ -112,7 +111,6 @@ LLView::LLView() :
112 mSaveToXML(TRUE), 111 mSaveToXML(TRUE),
113 mIsFocusRoot(FALSE), 112 mIsFocusRoot(FALSE),
114 mLastVisible(TRUE), 113 mLastVisible(TRUE),
115 mRenderInFastFrame(TRUE),
116 mSpanChildren(FALSE), 114 mSpanChildren(FALSE),
117 mVisible(TRUE), 115 mVisible(TRUE),
118 mHidden(FALSE), 116 mHidden(FALSE),
@@ -133,7 +131,6 @@ LLView::LLView(const LLString& name, BOOL mouse_opaque) :
133 mSaveToXML(TRUE), 131 mSaveToXML(TRUE),
134 mIsFocusRoot(FALSE), 132 mIsFocusRoot(FALSE),
135 mLastVisible(TRUE), 133 mLastVisible(TRUE),
136 mRenderInFastFrame(TRUE),
137 mSpanChildren(FALSE), 134 mSpanChildren(FALSE),
138 mVisible(TRUE), 135 mVisible(TRUE),
139 mHidden(FALSE), 136 mHidden(FALSE),
@@ -157,7 +154,6 @@ LLView::LLView(
157 mSaveToXML(TRUE), 154 mSaveToXML(TRUE),
158 mIsFocusRoot(FALSE), 155 mIsFocusRoot(FALSE),
159 mLastVisible(TRUE), 156 mLastVisible(TRUE),
160 mRenderInFastFrame(TRUE),
161 mSpanChildren(FALSE), 157 mSpanChildren(FALSE),
162 mVisible(TRUE), 158 mVisible(TRUE),
163 mHidden(FALSE), 159 mHidden(FALSE),
@@ -199,11 +195,6 @@ LLView::~LLView()
199 mParentView->removeChild(this); 195 mParentView->removeChild(this);
200 } 196 }
201 197
202 if(LLView::sFastFrameView == this)
203 {
204 LLView::sFastFrameView = NULL;
205 }
206
207 dispatch_list_t::iterator itor; 198 dispatch_list_t::iterator itor;
208 for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor) 199 for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor)
209 { 200 {
@@ -1789,26 +1780,6 @@ void LLView::localRectToScreen(const LLRect& local, LLRect* screen) const
1789 } 1780 }
1790} 1781}
1791 1782
1792LLView* LLView::getRootMostFastFrameView()
1793{
1794 if (gFocusMgr.getTopView() == this)
1795 {
1796 return this;
1797 }
1798
1799 if (getParent())
1800 {
1801 LLView* rootmost_view = getParent()->getRootMostFastFrameView();
1802 if (rootmost_view)
1803 {
1804 return rootmost_view;
1805 }
1806 }
1807
1808 return mRenderInFastFrame ? this : NULL;
1809}
1810
1811
1812LLView* LLView::getRootView() 1783LLView* LLView::getRootView()
1813{ 1784{
1814 LLView* view = this; 1785 LLView* view = this;