diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
| commit | 8a92612fd976b6e38383d9ee46be5b51053e0998 (patch) | |
| tree | 0c06d99c2b6a8aaa5c78661b488ff8b59b83c523 /indra/llui/llview.h | |
| parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
| parent | d6fda15c34896db3b911c3719871ce317edaab1d (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 8f167959b9..594a5eec6b 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -288,7 +288,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 @@ -544,11 +544,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; @@ -570,8 +572,6 @@ private: LLRootHandle<LLView> mHandle; BOOL mLastVisible; - BOOL mVisible; - S32 mNextInsertionOrdinal; static LLWindow* sWindow; // All root views must know about their window. |