summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-19 09:56:48 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-19 09:56:48 +0100
commitb550bb0f09197c35b80d18d540761a7831c3e89b (patch)
treed86f5574202c7415c93fc45c7a5cd1f7fe892d06 /indra/newview/llpanelmaininventory.h
parent8e474b095a9d228d62101540433937abdf623842 (diff)
parenta4fc76a0f749e07d703ddb7ed923d7c4ea94ab7e (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
-rw-r--r--indra/newview/llpanelmaininventory.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index b43e057f83..5a068373f5 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -36,6 +36,7 @@
#include "llpanel.h"
#include "llinventoryobserver.h"
+#include "lldndbutton.h"
#include "llfolderview.h"
@@ -145,7 +146,7 @@ protected:
*/
void setUploadCostIfNeeded();
private:
- LLPanel* mListCommands;
+ LLDragAndDropButton* mTrashButton;
LLMenuGL* mMenuGearDefault;
LLMenuGL* mMenuAdd;