summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-07-03 05:50:31 -0400
committerOz Linden <oz@lindenlab.com>2012-07-03 05:50:31 -0400
commite575a0ef04ed35ccdf4c0de50baecfc460b6c707 (patch)
tree927c3e9304edb7408eb81c1c1a591fa978db1b79 /indra/newview/llviewerobject.cpp
parentd59715d6f1028f86827f1bd7b43c29abe697fcc9 (diff)
parent770d8b0d01d3dabeccded0df3a06058f6196d829 (diff)
merge up to latest pathfinding project viewer
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 2c4392ad33..8d658adc8f 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -100,7 +100,6 @@
#include "lltrans.h"
#include "llsdutil.h"
#include "llmediaentry.h"
-#include "llpathfindingmanager.h"
//#define DEBUG_UPDATE_TYPE