diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-02 15:39:55 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-02 15:39:55 -0500 |
| commit | bde7d67066d189416a725da4527a02eb4f78ba4a (patch) | |
| tree | ef0897dcf3663ff236321054c4cdf3704ebf0ec6 /indra/newview/llpanelcontents.h | |
| parent | 96841c60b7d51cdb640feb5765d4bf21d047f122 (diff) | |
EXT-1866 : Inventory Side Panel
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel
Porting over changes from svn Inventory Panel work.
Diffstat (limited to 'indra/newview/llpanelcontents.h')
| -rw-r--r-- | indra/newview/llpanelcontents.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h index bab980b524..14256845a6 100644 --- a/indra/newview/llpanelcontents.h +++ b/indra/newview/llpanelcontents.h @@ -35,9 +35,14 @@ #include "v3math.h" #include "llpanel.h" +#include "llinventory.h" +#include "lluuid.h" +#include "llmap.h" +#include "llviewerobject.h" +#include "llvoinventorylistener.h" class LLButton; -class LLPanelInventory; +class LLPanelObjectInventory; class LLViewerObject; class LLCheckBoxCtrl; class LLSpinCtrl; @@ -70,7 +75,7 @@ protected: void getState(LLViewerObject *object); public: - LLPanelInventory* mPanelInventory; + LLPanelObjectInventory* mPanelInventoryObject; }; -#endif +#endif // LL_LLPANELCONTENTS_H |