summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-29 13:06:36 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-29 13:06:36 +0200
commit4c2dbe93635f0c25c347e4fe7152b78733697cdf (patch)
tree3991c33d46ee862c20b672b2c5e57768cb7a866b /indra/newview/llfolderviewitem.cpp
parentaea3d79be74210d537cb9f9afc54a4f2e240bc99 (diff)
parent8a7ca61479813f55481f1040f75cd6fc63e713d2 (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r--indra/newview/llfolderviewitem.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 4b48626b22..b05eb84e52 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -40,7 +40,6 @@
#include "llinventoryfilter.h"
#include "llpanel.h"
#include "llviewercontrol.h" // gSavedSettings
-#include "llviewerinventory.h"
#include "llviewerwindow.h" // Argh, only for setCursor()
// linden library includes