diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-18 23:50:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-18 23:50:50 -0500 |
| commit | 7ef1550fbb01acfb0cba0e849f1933462612784a (patch) | |
| tree | dde820baa0134031d46b0c117ad34545d9e8cfe9 /indra/newview/llfloatertools.h | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
| parent | e8b71e0585ab126f9e77da93d6830a1a73a7aa92 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatertools.h')
| -rw-r--r-- | indra/newview/llfloatertools.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h index fd81a75397..69636190fc 100644 --- a/indra/newview/llfloatertools.h +++ b/indra/newview/llfloatertools.h @@ -32,7 +32,6 @@ #include "llparcelselection.h" class LLButton; -class LLComboBox; class LLCheckBoxCtrl; class LLPanelPermissions; class LLPanelObject; @@ -140,7 +139,6 @@ public: LLCheckBoxCtrl* mCheckSnapToGrid; LLButton* mBtnGridOptions; - LLComboBox* mComboGridMode; LLCheckBoxCtrl* mCheckStretchUniform; LLCheckBoxCtrl* mCheckStretchTexture; @@ -179,6 +177,8 @@ public: LLPanelFace *mPanelFace; LLPanelLandInfo *mPanelLandInfo; + LLViewBorder* mCostTextBorder; + LLTabContainer* mTabLand; LLParcelSelectionHandle mParcelSelection; |