summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-02-25 18:24:07 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-02-25 18:24:07 -0800
commit9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (patch)
tree9c0df85bb3a8b5c4e58655179e1b29ee31594cfc /indra/newview/llfolderviewitem.cpp
parent5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (diff)
parentdb4e46e93d06c03520cb7c781b8e41b6d374414d (diff)
automated merge from trunk
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