diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
commit | abb23ff31260e9632406dae03be920a23220d719 (patch) | |
tree | a24029245cf2ca511f3893e1b42e04ac3e9a90db /indra/newview/llpaneloutfitsinventory.h | |
parent | 9d8b189886ae14800d58f9729d8c8ea9b338ed52 (diff) | |
parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpaneloutfitsinventory.h')
-rw-r--r-- | indra/newview/llpaneloutfitsinventory.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h index 7769a7d172..aa0ab4efbc 100644 --- a/indra/newview/llpaneloutfitsinventory.h +++ b/indra/newview/llpaneloutfitsinventory.h @@ -65,10 +65,12 @@ public: // Otherwise, return NULL. LLFolderViewEventListener* getCorrectListenerForAction(); void setParent(LLSidepanelAppearance *parent); + + LLFolderView* getRootFolder(); + protected: void updateParent(); bool getIsCorrectType(const LLFolderViewEventListener *listenerp) const; - LLFolderView* getRootFolder(); private: LLSidepanelAppearance* mParent; |