merge from viewer-public

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index a919b07ed6..f243bbd471 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -47,6 +47,7 @@ class LLPanelOutfitsInventory;
 
 class LLSidepanelAppearance : public LLPanel
 {
+	LOG_CLASS(LLSidepanelAppearance);
 public:
 	LLSidepanelAppearance();
 	virtual ~LLSidepanelAppearance();
@@ -56,14 +57,15 @@ public:
 
 	void refreshCurrentOutfitName(const std::string& name = "");
 
-	static void editWearable(LLWearable *wearable, void *data);
+	static void editWearable(LLWearable *wearable, LLView *data);
 
 	void fetchInventory();
 	void inventoryFetched();
 	void onNewOutfitButtonClicked();
 
 	void showOutfitsInventoryPanel();
-	void showOutfitEditPanel(bool update);
+	void showOutfitEditPanel();
+	void showWearableEditPanel(LLWearable *wearable = NULL);
 	void setWearablesLoading(bool val);
 
 private:
@@ -71,10 +73,8 @@ private:
 
 	void onOpenOutfitButtonClicked();
 	void onEditAppearanceButtonClicked();
-	void onEditOutfitButtonClicked();
-	void onEditWearBackClicked();
 
-	//@deprecated use showXXX() methods instead
+	void togglMyOutfitsPanel(BOOL visible);
 	void toggleOutfitEditPanel(BOOL visible);
 	void toggleWearableEditPanel(BOOL visible, LLWearable* wearable = NULL);
 
@@ -100,6 +100,9 @@ private:
 	// Search string for filtering landmarks and teleport
 	// history locations
 	std::string					mFilterSubString;
+
+	// Gets set to true when we're opened for the first time.
+	bool mOpened;
 };
 
 #endif //LL_LLSIDEPANELAPPEARANCE_H