diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/newview/llfloatertools.h | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/newview/llfloatertools.h')
| -rw-r--r-- | indra/newview/llfloatertools.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h index 7c85444578..156f768459 100644 --- a/indra/newview/llfloatertools.h +++ b/indra/newview/llfloatertools.h @@ -24,7 +24,6 @@ class LLPanelContents; class LLPanelFace; class LLPanelLandInfo; class LLComboBox; -class LLVolumeSliderCtrl; class LLParcelSelection; class LLObjectSelection; @@ -100,7 +99,6 @@ public: LLCheckBoxCtrl *mRadioOrbit; LLCheckBoxCtrl *mRadioZoom; LLCheckBoxCtrl *mRadioPan; - LLVolumeSliderCtrl *mSliderZoom; // Move buttons LLCheckBoxCtrl *mRadioMove; |