diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-18 14:48:59 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-18 14:48:59 -0400 |
commit | b73291e9bd6a706c5c8913f1c40bd8324f772c4a (patch) | |
tree | 412a776e4bb8ae72960ea02d40ea7c98be1c1065 /indra/newview/llfloatertools.h | |
parent | d36a9a7907a1528a8d163577a0770b50e6248802 (diff) | |
parent | 91eb63bdde50d3a75908909af0e23d54f5c2fd21 (diff) |
merged .hgtags
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; |