summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-22 17:12:45 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-22 17:12:45 +0000
commit5cf582dbbfe4a7412bb3ea053fb20be7b9601859 (patch)
tree41e4d03beafd00095c1972a85fb317c8d7af8df0 /indra/newview/llstartup.cpp
parentb05a2dc76acc6c1ca4bfc09de37326027dbf038d (diff)
parent04712617c55c53dbec1f73a4e8834ebe3167e5ed (diff)
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index fa07278cb9..83f773fadc 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -200,10 +200,6 @@
#include "lldxhardware.h"
#endif
-#if (LL_LINUX || LL_SOLARIS) && LL_GTK
-#include <glib/gspawn.h>
-#endif
-
//
// exported globals
//