diff options
| author | Jacek Antonelli | 2008-09-28 13:56:00 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-28 19:55:41 -0500 |
| commit | 9a4f5702473e7540cde1bbff2d7189d9ed71fd86 (patch) | |
| tree | 53d52a965085be43c89ef45592a8198f7befc4be /linden/indra/newview/llfloatertools.h | |
| parent | Second Life viewer sources 1.21.2-RC (diff) | |
| parent | Merge branch 'VWR-8341' into next-merge (diff) | |
| download | meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.zip meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.gz meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.bz2 meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.xz | |
Updated to SL source 1.21.2.
Conflicts:
linden/indra/SConstruct
linden/indra/newview/files.lst
linden/indra/newview/llfloatertools.cpp
linden/indra/newview/llfloatertools.h
linden/indra/newview/lloverlaybar.cpp
linden/indra/newview/lloverlaybar.h
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/indra/newview/llfloatertools.h')
| -rw-r--r-- | linden/indra/newview/llfloatertools.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h index a75aa87..c4d6337 100644 --- a/linden/indra/newview/llfloatertools.h +++ b/linden/indra/newview/llfloatertools.h | |||
| @@ -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 | LLCheckBoxCtrl *mCheckShowOwners; | |
| 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 | ||