diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llfloatertools.h | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloatertools.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h index 00af3cc..833a8a7 100644 --- a/linden/indra/newview/llfloatertools.h +++ b/linden/indra/newview/llfloatertools.h | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -95,7 +96,6 @@ public: | |||
95 | /*virtual*/ void draw(); | 96 | /*virtual*/ void draw(); |
96 | 97 | ||
97 | void dirty(); | 98 | void dirty(); |
98 | void showMore(BOOL show_more); | ||
99 | void showPanel(EInfoPanel panel); | 99 | void showPanel(EInfoPanel panel); |
100 | 100 | ||
101 | void setStatusText(const std::string& text); | 101 | void setStatusText(const std::string& text); |
@@ -168,11 +168,10 @@ public: | |||
168 | LLCheckBoxCtrl *mRadioDozerSmooth; | 168 | LLCheckBoxCtrl *mRadioDozerSmooth; |
169 | LLCheckBoxCtrl *mRadioDozerNoise; | 169 | LLCheckBoxCtrl *mRadioDozerNoise; |
170 | LLCheckBoxCtrl *mRadioDozerRevert; | 170 | LLCheckBoxCtrl *mRadioDozerRevert; |
171 | LLSlider *mSliderDozerSize; | ||
171 | LLSlider *mSliderDozerForce; | 172 | LLSlider *mSliderDozerForce; |
172 | 173 | ||
173 | LLComboBox *mComboDozerSize; | ||
174 | LLButton *mBtnApplyToSelection; | 174 | LLButton *mBtnApplyToSelection; |
175 | LLCheckBoxCtrl *mCheckShowOwners; | ||
176 | 175 | ||
177 | std::vector<LLButton*> mButtons;//[ 15 ]; | 176 | std::vector<LLButton*> mButtons;//[ 15 ]; |
178 | 177 | ||
@@ -191,8 +190,6 @@ public: | |||
191 | 190 | ||
192 | private: | 191 | private: |
193 | BOOL mDirty; | 192 | BOOL mDirty; |
194 | S32 mSmallHeight; | ||
195 | S32 mLargeHeight; | ||
196 | 193 | ||
197 | std::map<std::string, std::string> mStatusText; | 194 | std::map<std::string, std::string> mStatusText; |
198 | }; | 195 | }; |