diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-07-14 11:11:31 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-07-14 11:11:31 -0500 |
| commit | 13202e744c35f0c6154cd0b582b1834896cacb79 (patch) | |
| tree | 6a78237dd74c6270201afb6921e34e0b81dcfad5 /indra/llui/llview.h | |
| parent | b46fff1ba1450d14424e676f31c0cacd921bedb0 (diff) | |
| parent | 2dd3a6be720ed6ce7c17415fc8d81869cf46f3a0 (diff) | |
merge
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 8e705ed701..7e05468590 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -294,7 +294,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. |