summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorrider <rider@lindenlab.com>2015-10-01 12:36:52 -0700
committerrider <rider@lindenlab.com>2015-10-01 12:36:52 -0700
commitca81b19e80d0e0301b08bad9bd32ada937dea10d (patch)
tree86e33382a19aa9b9f1555b8987a1a6b511b8cbe5 /indra/newview/pipeline.cpp
parent17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff)
parent4334fd27e2215c1bfad3aa7ab7130b8c6b289de5 (diff)
Merge for Xcode 7
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 03712c1065..57e2faca5b 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -105,7 +105,6 @@
#include "llspatialpartition.h"
#include "llmutelist.h"
#include "lltoolpie.h"
-#include "llcurl.h"
#include "llnotifications.h"
#include "llpathinglib.h"
#include "llfloaterpathfindingconsole.h"