summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-09-30 15:59:38 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2011-09-30 15:59:38 +0300
commit4ac6eed116a888e113d6f4f031e57e09a141b55a (patch)
treedf6e87ff58a6008dbe1006874ba5a53af91d1871 /indra/newview/llpanelteleporthistory.cpp
parent66e21e0330b2f66b986a1ed76873af9752dcf2e1 (diff)
parent9d3fc5d930bd1dae07771350080e5140c0113891 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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 52dd70f005..79171dbcb9 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -31,7 +31,6 @@
#include "llfloaterworldmap.h"
#include "llpanelteleporthistory.h"
-#include "llsidetray.h"
#include "llworldmap.h"
#include "llteleporthistorystorage.h"
#include "lltextutil.h"