diff options
author | Jacek Antonelli | 2008-09-22 14:53:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-22 14:53:50 -0500 |
commit | 5dc552157834cc1284841956d18f640275747feb (patch) | |
tree | 976f145ed42ed0b2c4d6fa19c3d313be77be771c /linden/indra/newview/llfloatertools.h | |
parent | Merge branch 'build-tools' into next-merge (diff) | |
parent | VWR-8430: Usability improvements to the land tools floater. (diff) | |
download | meta-impy-5dc552157834cc1284841956d18f640275747feb.zip meta-impy-5dc552157834cc1284841956d18f640275747feb.tar.gz meta-impy-5dc552157834cc1284841956d18f640275747feb.tar.bz2 meta-impy-5dc552157834cc1284841956d18f640275747feb.tar.xz |
Merge branch 'land-tools' into next-merge
Diffstat (limited to 'linden/indra/newview/llfloatertools.h')
-rw-r--r-- | linden/indra/newview/llfloatertools.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h index b0a804b..3d8a144 100644 --- a/linden/indra/newview/llfloatertools.h +++ b/linden/indra/newview/llfloatertools.h | |||
@@ -48,6 +48,7 @@ class LLPanelContents; | |||
48 | class LLPanelFace; | 48 | class LLPanelFace; |
49 | class LLPanelLandInfo; | 49 | class LLPanelLandInfo; |
50 | class LLComboBox; | 50 | class LLComboBox; |
51 | class LLSlider; | ||
51 | class LLParcelSelection; | 52 | class LLParcelSelection; |
52 | class LLObjectSelection; | 53 | class LLObjectSelection; |
53 | 54 | ||
@@ -167,10 +168,10 @@ public: | |||
167 | LLCheckBoxCtrl *mRadioDozerSmooth; | 168 | LLCheckBoxCtrl *mRadioDozerSmooth; |
168 | LLCheckBoxCtrl *mRadioDozerNoise; | 169 | LLCheckBoxCtrl *mRadioDozerNoise; |
169 | LLCheckBoxCtrl *mRadioDozerRevert; | 170 | LLCheckBoxCtrl *mRadioDozerRevert; |
171 | LLSlider *mSliderDozerSize; | ||
172 | LLSlider *mSliderDozerForce; | ||
170 | 173 | ||
171 | LLComboBox *mComboDozerSize; | ||
172 | LLButton *mBtnApplyToSelection; | 174 | LLButton *mBtnApplyToSelection; |
173 | LLCheckBoxCtrl *mCheckShowOwners; | ||
174 | 175 | ||
175 | std::vector<LLButton*> mButtons;//[ 15 ]; | 176 | std::vector<LLButton*> mButtons;//[ 15 ]; |
176 | 177 | ||