summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-29 12:09:37 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-29 12:09:37 -0800
commite2612effbe463cd89853d3d6a047b3aa7e275975 (patch)
tree148fb7fb1bdbf84c148d8ccb6496a6fba7ef9afb /indra/newview/llpanelteleporthistory.cpp
parent5a34cf1af83314774f11b0d24279794794bc9147 (diff)
parentfab60b8c05a89498bd8efeafdea8acfa5f94f06c (diff)
merge from viewer2
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rw-r--r--indra/newview/llpanelteleporthistory.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 6005881148..43e0f9a88c 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -46,7 +46,6 @@
#include "llnotificationsutil.h"
#include "lltextbox.h"
#include "llviewermenu.h"
-#include "llviewerinventory.h"
#include "lllandmarkactions.h"
#include "llclipboard.h"