diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llcontainerview.h | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llcontainerview.h')
-rw-r--r-- | linden/indra/newview/llcontainerview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llcontainerview.h b/linden/indra/newview/llcontainerview.h index 62222b5..a65f7a7 100644 --- a/linden/indra/newview/llcontainerview.h +++ b/linden/indra/newview/llcontainerview.h | |||
@@ -42,7 +42,7 @@ class LLContainerView : public LLView | |||
42 | { | 42 | { |
43 | protected: | 43 | protected: |
44 | BOOL mDisplayChildren; | 44 | BOOL mDisplayChildren; |
45 | LLString mLabel; | 45 | std::string mLabel; |
46 | public: | 46 | public: |
47 | BOOL mCollapsible; | 47 | BOOL mCollapsible; |
48 | public: | 48 | public: |
@@ -56,7 +56,7 @@ public: | |||
56 | virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); | 56 | virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); |
57 | virtual LLRect getRequiredRect(); // Return the height of this object, given the set options. | 57 | virtual LLRect getRequiredRect(); // Return the height of this object, given the set options. |
58 | 58 | ||
59 | void setLabel(const LLString& label); | 59 | void setLabel(const std::string& label); |
60 | void showLabel(BOOL show) { mShowLabel = show; } | 60 | void showLabel(BOOL show) { mShowLabel = show; } |
61 | void setDisplayChildren(const BOOL displayChildren); | 61 | void setDisplayChildren(const BOOL displayChildren); |
62 | BOOL getDisplayChildren() { return mDisplayChildren; } | 62 | BOOL getDisplayChildren() { return mDisplayChildren; } |