diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 22:23:14 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 22:23:14 -0500 |
commit | a39bda1b775a161558f75bd0a23575b8ef78a80e (patch) | |
tree | 576d3d26baad182b19cab1b1f9a09acc639030ff /indra/newview/llpanelmaininventory.h | |
parent | a58dd26b205d4e626028f1c7d27858d2ec927e41 (diff) | |
parent | 68c6ff791ffdd01e98cf7fae61b868db4a6d1698 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
-rw-r--r-- | indra/newview/llpanelmaininventory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 29e9baa6cf..fbc0f09c50 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -35,7 +35,8 @@ #define LL_LLPANELMAININVENTORY_H
#include "llpanel.h"
-#include "llinventorymodel.h"
+#include "llinventoryobserver.h"
+
#include "llfolderview.h"
class LLFolderViewItem;
|