diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
| commit | 19857d0cf0eedb76cac4eb8a1a4a0b33de9e4235 (patch) | |
| tree | 09d6015fedca390d1a259a9911491087cf088df5 /indra/llui/llview.h | |
| parent | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff) | |
| parent | 4bbfdd4c1fc18162960ba61fbdad40940a4cdd89 (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 61dc4b8030..9ab0797f9e 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -287,7 +287,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 @@ -543,11 +543,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; @@ -569,8 +571,6 @@ private: LLRootHandle<LLView> mHandle; BOOL mLastVisible; - BOOL mVisible; - S32 mNextInsertionOrdinal; static LLWindow* sWindow; // All root views must know about their window. |