summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmarketplaceoutboxinventory.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-06-15 09:56:47 -0700
committerRichard Linden <none@none>2012-06-15 09:56:47 -0700
commit86103dd5d40a685c3ba0ad385e6585e005785e50 (patch)
tree363d2731af7e73143f54962e8f9fc8f290202ef8 /indra/newview/llpanelmarketplaceoutboxinventory.cpp
parent569146f27c7350ca2245f1fa7bc4cb9c16a428ea (diff)
parent9940ca5ae7698e89c0587733f7ab922027c8ddcc (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui-folderview
Diffstat (limited to 'indra/newview/llpanelmarketplaceoutboxinventory.cpp')
-rw-r--r--indra/newview/llpanelmarketplaceoutboxinventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmarketplaceoutboxinventory.cpp b/indra/newview/llpanelmarketplaceoutboxinventory.cpp
index ff62cb23db..b5c7c4ca88 100644
--- a/indra/newview/llpanelmarketplaceoutboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceoutboxinventory.cpp
@@ -28,7 +28,7 @@
#include "llpanelmarketplaceoutboxinventory.h"
-#include "llfolderview.h"
+#include "llfolderviewitem.h"
#include "llfoldervieweventlistener.h"
#include "llinventorybridge.h"
#include "llinventoryfunctions.h"