automated merge

1 files changed, 5 insertions, 8 deletions

diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 5c00f84e0e..ba382d7320 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -81,10 +81,6 @@ public:
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void changed(U32 mask);
 
-	void reset();
-		// Ignore all old information, useful if you are 
-		// recycling an existing dialog and need to clear it.
-
 	/*virtual*/ void setParcelID(const LLUUID& parcel_id);
 		// Sends a request for data about the given parcel, which will
 		// only update the location if there is none already available.
@@ -100,7 +96,7 @@ public:
 	void onEditWearableClicked(void);
 	void onUpClicked(void);
 
-	void displayLookInfo(const LLInventoryCategory* pLook);
+	void displayCurrentOutfit();
 	
 	void lookFetched(void);
 	
@@ -108,8 +104,10 @@ public:
 
 private:
 
-	LLUUID				mLookID;
-	LLTextBox*			mLookName;
+	//*TODO got rid of mCurrentOutfitID
+	LLUUID				mCurrentOutfitID;
+
+	LLTextBox*			mCurrentOutfitName;
 	LLScrollListCtrl*	mLookContents;
 	LLInventoryPanel*	mInventoryItemsPanel;
 	LLFilterEditor*		mSearchFilter;
@@ -119,7 +117,6 @@ private:
 	LLButton*			mRemoveFromLookBtn;
 	LLButton*			mUpBtn;
 	LLButton*			mEditWearableBtn;
-	S32					mNumItemsInLook;
 	
 	LLLookFetchObserver*		mFetchLook;
 	LLInventoryLookObserver*	mLookObserver;