diff options
author | Jacek Antonelli | 2008-12-01 17:39:58 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-01 17:40:06 -0600 |
commit | 7abecb48babe6a6f09bf6692ba55076546cfced9 (patch) | |
tree | 8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/llui/llfloater.cpp | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2 meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz |
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/llui/llfloater.cpp')
-rw-r--r-- | linden/indra/llui/llfloater.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp index 9f8cd65..047342f 100644 --- a/linden/indra/llui/llfloater.cpp +++ b/linden/indra/llui/llfloater.cpp | |||
@@ -127,6 +127,7 @@ LLFloaterView* gFloaterView = NULL; | |||
127 | 127 | ||
128 | LLFloater::LLFloater() : | 128 | LLFloater::LLFloater() : |
129 | //FIXME: we should initialize *all* member variables here | 129 | //FIXME: we should initialize *all* member variables here |
130 | LLPanel(), mAutoFocus(TRUE), | ||
130 | mResizable(FALSE), | 131 | mResizable(FALSE), |
131 | mDragOnLeft(FALSE), | 132 | mDragOnLeft(FALSE), |
132 | mMinWidth(0), | 133 | mMinWidth(0), |
@@ -139,6 +140,11 @@ LLFloater::LLFloater() : | |||
139 | mButtonsEnabled[i] = FALSE; | 140 | mButtonsEnabled[i] = FALSE; |
140 | mButtons[i] = NULL; | 141 | mButtons[i] = NULL; |
141 | } | 142 | } |
143 | for (S32 i = 0; i < 4; i++) | ||
144 | { | ||
145 | mResizeBar[i] = NULL; | ||
146 | mResizeHandle[i] = NULL; | ||
147 | } | ||
142 | mDragHandle = NULL; | 148 | mDragHandle = NULL; |
143 | mHandle.bind(this); | 149 | mHandle.bind(this); |
144 | } | 150 | } |
@@ -151,6 +157,11 @@ LLFloater::LLFloater(const std::string& name) | |||
151 | mButtonsEnabled[i] = FALSE; | 157 | mButtonsEnabled[i] = FALSE; |
152 | mButtons[i] = NULL; | 158 | mButtons[i] = NULL; |
153 | } | 159 | } |
160 | for (S32 i = 0; i < 4; i++) | ||
161 | { | ||
162 | mResizeBar[i] = NULL; | ||
163 | mResizeHandle[i] = NULL; | ||
164 | } | ||
154 | std::string title; // null string | 165 | std::string title; // null string |
155 | initFloater(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults | 166 | initFloater(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults |
156 | } | 167 | } |
@@ -171,6 +182,11 @@ LLFloater::LLFloater(const std::string& name, const LLRect& rect, const std::str | |||
171 | mButtonsEnabled[i] = FALSE; | 182 | mButtonsEnabled[i] = FALSE; |
172 | mButtons[i] = NULL; | 183 | mButtons[i] = NULL; |
173 | } | 184 | } |
185 | for (S32 i = 0; i < 4; i++) | ||
186 | { | ||
187 | mResizeBar[i] = NULL; | ||
188 | mResizeHandle[i] = NULL; | ||
189 | } | ||
174 | initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn); | 190 | initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn); |
175 | } | 191 | } |
176 | 192 | ||
@@ -189,6 +205,11 @@ LLFloater::LLFloater(const std::string& name, const std::string& rect_control, c | |||
189 | mButtonsEnabled[i] = FALSE; | 205 | mButtonsEnabled[i] = FALSE; |
190 | mButtons[i] = NULL; | 206 | mButtons[i] = NULL; |
191 | } | 207 | } |
208 | for (S32 i = 0; i < 4; i++) | ||
209 | { | ||
210 | mResizeBar[i] = NULL; | ||
211 | mResizeHandle[i] = NULL; | ||
212 | } | ||
192 | initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn); | 213 | initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn); |
193 | } | 214 | } |
194 | 215 | ||
@@ -1580,6 +1601,7 @@ void LLFloater::updateButtons() | |||
1580 | S32 button_count = 0; | 1601 | S32 button_count = 0; |
1581 | for (S32 i = 0; i < BUTTON_COUNT; i++) | 1602 | for (S32 i = 0; i < BUTTON_COUNT; i++) |
1582 | { | 1603 | { |
1604 | if(!mButtons[i]) continue; | ||
1583 | mButtons[i]->setEnabled(mButtonsEnabled[i]); | 1605 | mButtons[i]->setEnabled(mButtonsEnabled[i]); |
1584 | 1606 | ||
1585 | if (mButtonsEnabled[i] | 1607 | if (mButtonsEnabled[i] |