diff options
author | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
commit | e575a0ef04ed35ccdf4c0de50baecfc460b6c707 (patch) | |
tree | 927c3e9304edb7408eb81c1c1a591fa978db1b79 /indra/newview/llpanelobject.cpp | |
parent | d59715d6f1028f86827f1bd7b43c29abe697fcc9 (diff) | |
parent | 770d8b0d01d3dabeccded0df3a06058f6196d829 (diff) |
merge up to latest pathfinding project viewer
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r-- | indra/newview/llpanelobject.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index a740db00e2..068ccf23b5 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -66,8 +66,6 @@ #include "llviewercontrol.h" #include "lluictrlfactory.h" //#include "llfirstuse.h" -#include "llfloatertools.h" -#include "llpathfindingmanager.h" #include "lldrawpool.h" |