diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-30 19:05:46 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-30 19:05:46 +0300 |
commit | 9fda462330692dafc66f1b47d67c5378cf4e3552 (patch) | |
tree | a9a756a6a068d03567da369dc43791fcbd2c383c /indra/newview/llpaneloutfitedit.h | |
parent | 23bd34a78163c31bc2a661acd15db63ed248af53 (diff) | |
parent | 66e407c1ca9287796e6588ae1df3304c7ac87b98 (diff) |
Manual merge.
By the way, removed "Add to outfit" and "Remove from outfit" buttons from the Edit Outfit panels.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpaneloutfitedit.h')
-rw-r--r-- | indra/newview/llpaneloutfitedit.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h index 3d01303ee1..0074cd517b 100644 --- a/indra/newview/llpaneloutfitedit.h +++ b/indra/newview/llpaneloutfitedit.h @@ -122,8 +122,6 @@ private: LLFilterEditor* mSearchFilter; LLSaveFolderState* mSavedFolderState; std::string mSearchString; - LLButton* mAddToOutfitBtn; - LLButton* mRemoveFromOutfitBtn; LLButton* mEditWearableBtn; LLToggleableMenu* mSaveMenu; |