summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitsinventory.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-21 11:24:33 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-21 11:24:33 -0700
commitb088449517c7070ba15b6e344dbc7a1145f64dac (patch)
tree66562b72586081f59fa74e9baaedf560ff49ffd5 /indra/newview/llpaneloutfitsinventory.h
parent4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (diff)
parentbb95afc9e1246abfc3656b31b33d1e5ae1dc85f2 (diff)
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
Diffstat (limited to 'indra/newview/llpaneloutfitsinventory.h')
-rw-r--r--indra/newview/llpaneloutfitsinventory.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
index 863dc9dd7c..eabfda7f8c 100644
--- a/indra/newview/llpaneloutfitsinventory.h
+++ b/indra/newview/llpaneloutfitsinventory.h
@@ -72,7 +72,6 @@ public:
// If a compatible listener type is selected, then return a pointer to that.
// Otherwise, return NULL.
LLFolderViewEventListener* getCorrectListenerForAction();
- void setParent(LLSidepanelAppearance *parent);
LLFolderView* getRootFolder();
static LLSidepanelAppearance* getAppearanceSP();
@@ -84,7 +83,6 @@ protected:
bool getIsCorrectType(const LLFolderViewEventListener *listenerp) const;
private:
- LLSidepanelAppearance* mParent;
LLSaveFolderState* mSavedFolderState;
LLTabContainer* mAppearanceTabs;
std::string mFilterSubString;