diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
commit | 98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch) | |
tree | a24352a4ce377d91428554aab15f96f887b24514 /indra/newview/llsidepanelappearance.h | |
parent | 9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff) | |
parent | 2c5c563319d5ba8eaeae93b627536321956d347e (diff) |
Merge with tip
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
-rw-r--r-- | indra/newview/llsidepanelappearance.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index aa2e67fd16..1d78e92a84 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -36,7 +36,7 @@ #include "llinventoryobserver.h" #include "llinventory.h" -#include "llpanellookinfo.h" +#include "llpaneloutfitedit.h" class LLFilterEditor; class LLCurrentlyWornFetchObserver; @@ -71,12 +71,12 @@ private: void onEditButtonClicked(); void onBackButtonClicked(); void onEditWearBackClicked(); - void toggleLookInfoPanel(BOOL visible); + void toggleOutfitEditPanel(BOOL visible); void toggleWearableEditPanel(BOOL visible, LLWearable* wearable); LLFilterEditor* mFilterEditor; LLPanelOutfitsInventory* mPanelOutfitsInventory; - LLPanelLookInfo* mLookInfo; + LLPanelOutfitEdit* mOutfitEdit; LLPanelEditWearable* mEditWearable; LLButton* mOpenOutfitBtn; |