diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llview.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/llview.h | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 459041f67d..262ebf7c21 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1325,11 +1325,7 @@ void LLView::drawChildren() child_list_reverse_iter_t child = child_iter++; LLView *viewp = *child; - if (!viewp->getVisible() || !viewp->getRect().isValid()) - { - continue; - } - + if (viewp->getVisible() && viewp->getRect().isValid()) { // Only draw views that are within the root view localRectToScreen(viewp->getRect(),&screenRect); diff --git a/indra/llui/llview.h b/indra/llui/llview.h index efae00f0e5..aaa1305161 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -295,7 +295,7 @@ public: void setAllChildrenEnabled(BOOL b); virtual void setVisible(BOOL visible); - BOOL getVisible() const { return mVisible; } + const BOOL& getVisible() const { return mVisible; } virtual void setEnabled(BOOL enabled); BOOL getEnabled() const { return mEnabled; } /// 'available' in this context means 'visible and enabled': in other @@ -555,11 +555,13 @@ private: LLView* mParentView; child_list_t mChildList; - std::string mName; // location in pixels, relative to surrounding structure, bottom,left=0,0 + BOOL mVisible; LLRect mRect; LLRect mBoundingRect; + std::string mLayout; + std::string mName; U32 mReshapeFlags; @@ -581,8 +583,6 @@ private: LLRootHandle<LLView> mHandle; BOOL mLastVisible; - BOOL mVisible; - S32 mNextInsertionOrdinal; static LLWindow* sWindow; // All root views must know about their window. |