diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
--- linden.orig/indra/SConstruct	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/SConstruct	2008-05-08 16:36:16.000000000 -0600
@@ -118,7 +118,7 @@
 standalone = optenv['STANDALONE']
 runtests = optenv['RUNTESTS']
 opensource = standalone or optenv['OPENSOURCE']
-enable_fmod = not opensource and optenv['FMOD']
+enable_fmod = optenv['FMOD']
 elfio = optenv['ELFIO']
 
 targets = [ target_param ]
@@ -141,6 +141,7 @@
     'gdk-pixbuf-2.0',
     'glib-2.0',
     'gmodule-2.0',
+    'gthread-2.0',
     'gtk+-2.0',
     'libpng',
     'pango',
@@ -161,6 +162,9 @@
     'libssl',
     ]
 
+if enable_gstreamer:
+    standalone_pkgs += [ 'gstreamer-0.10' ]
+
 def pkgconfig(opt, pkgs=None):
     if pkgs is None:
         pkgs = standalone_pkgs + standalone_net_pkgs
@@ -249,7 +253,7 @@
     ##############
 
     # Generic GCC flags
-    cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '
+    cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
     cxxflags = ''
     cppflags = '-D_FORTIFY_SOURCE=2 '
     if standalone:
@@ -297,6 +301,9 @@
                             'llfreetype2', 'pango-1.0' ]
                 include_dirs += ['../libraries/' + system_str + '/include/' + d
                                  for d in incdirs]
+                include_dirs += [d[2:] for d in
+                                 pkgconfig('--cflags', [ 'gtk+-2.0' ]).split()
+                                 ]
 
             if elfio:
                 client_external_libs += [ 'ELFIO' ]
@@ -613,7 +620,7 @@
         net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
     net_external_libs += [ 'cares', 'expat' ]
 
-    common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]
+    common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ]
 
     if build_target == 'client':
         if platform == 'linux':
@@ -755,7 +762,7 @@
                             internal_libs + external_libs)
 
         # Rpcserver
-        external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient']
+        external_libs = common_external_libs + ['xmlrpc', 'mysqlclient']
         internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs', 
                 'llmath', 'llcommon']
         create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',
diff -Naur linden.orig/indra/llcommon/llares.cpp linden/indra/llcommon/llares.cpp
--- linden.orig/indra/llcommon/llares.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llcommon/llares.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -31,11 +31,7 @@
  * $/LicenseInfo$
  */
 
-#ifdef LL_STANDALONE
-# include <ares_dns.h>
-#else
-# include <ares/ares_dns.h>
-#endif
+#include <ares_dns.h>
 
 #include "apr-1/apr_portable.h"
 #include "apr-1/apr_network_io.h"
diff -Naur linden.orig/indra/llcommon/llares.h linden/indra/llcommon/llares.h
--- linden.orig/indra/llcommon/llares.h	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llcommon/llares.h	2008-05-08 16:31:20.000000000 -0600
@@ -38,11 +38,7 @@
 # include <ws2tcpip.h>
 #endif
 
-#ifdef LL_STANDALONE
-# include <ares.h>
-#else
-# include <ares/ares.h>
-#endif
+#include <ares.h>
 
 #include "llmemory.h"
 #include "lluri.h"
diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp
--- linden.orig/indra/llcommon/llsdserialize_xml.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llcommon/llsdserialize_xml.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -39,11 +39,7 @@
 
 extern "C"
 {
-#ifdef LL_STANDALONE
-# include <expat.h>
-#else
-# include "expat/expat.h"
-#endif
+#include <expat.h>
 }
 
 /**
diff -Naur linden.orig/indra/llcommon/llsys.cpp linden/indra/llcommon/llsys.cpp
--- linden.orig/indra/llcommon/llsys.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llcommon/llsys.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -34,11 +34,7 @@
 #include "llsys.h"
 
 #include <iostream>
-#ifdef LL_STANDALONE
-# include <zlib.h>
-#else
-# include "zlib/zlib.h"
-#endif
+#include <zlib.h>
 
 #include "llprocessor.h"
 
diff -Naur linden.orig/indra/llimage/llimagejpeg.h linden/indra/llimage/llimagejpeg.h
--- linden.orig/indra/llimage/llimagejpeg.h	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llimage/llimagejpeg.h	2008-05-08 16:31:20.000000000 -0600
@@ -37,13 +37,8 @@
 #include "llimage.h"
 
 extern "C" {
-#ifdef LL_STANDALONE
-# include <jpeglib.h>
-# include <jerror.h>
-#else
-# include "jpeglib/jpeglib.h"
-# include "jpeglib/jerror.h"
-#endif
+#include <jpeglib.h>
+#include <jerror.h>
 }
 
 class LLImageJPEG : public LLImageFormatted
diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llimagej2coj/llimagej2coj.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -33,7 +33,7 @@
 #include "llimagej2coj.h"
 
 // this is defined so that we get static linking.
-#include "openjpeg/openjpeg.h"
+#include "openjpeg.h"
 
 #include "lltimer.h"
 #include "llmemory.h"
diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp
--- linden.orig/indra/llmath/llquaternion.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llmath/llquaternion.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -698,22 +698,22 @@
 	{
 	default:
 	case LLQuaternion::XYZ:
-		p = "XYZ";
+		strcpy(p, "XYZ");
 		break;
 	case LLQuaternion::YZX:
-		p = "YZX";
+		strcpy(p, "YZX");
 		break;
 	case LLQuaternion::ZXY:
-		p = "ZXY";
+		strcpy(p, "ZXY");
 		break;
 	case LLQuaternion::XZY:
-		p = "XZY";
+		strcpy(p, "XZY");
 		break;
 	case LLQuaternion::YXZ:
-		p = "YXZ";
+		strcpy(p, "YXZ");
 		break;
 	case LLQuaternion::ZYX:
-		p = "ZYX";
+		strcpy(p, "ZYX");
 		break;
 	}
 	return p;
diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp
--- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -80,7 +80,7 @@
 
 #include <sstream>
 #include <iterator>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
 #include "apr-1/apr_base64.h"
 
 #include "llbuffer.h"
diff -Naur linden.orig/indra/llmessage/llhttpassetstorage.cpp linden/indra/llmessage/llhttpassetstorage.cpp
--- linden.orig/indra/llmessage/llhttpassetstorage.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llmessage/llhttpassetstorage.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -41,11 +41,7 @@
 #include "llvfile.h"
 #include "llvfs.h"
 
-#ifdef LL_STANDALONE
-# include <zlib.h>
-#else
-# include "zlib/zlib.h"
-#endif
+#include <zlib.h>
 
 const U32 MAX_RUNNING_REQUESTS = 1;
 const F32 MAX_PROCESSING_TIME = 0.005f;
diff -Naur linden.orig/indra/llrender/llfont.cpp linden/indra/llrender/llfont.cpp
--- linden.orig/indra/llrender/llfont.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llrender/llfont.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -34,12 +34,7 @@
 #include "llfont.h"
 
 // Freetype stuff
-#if !defined(LL_LINUX) || defined(LL_STANDALONE)
 # include <ft2build.h>
-#else
-// I had to do some work to avoid the system-installed FreeType headers... --ryan.
-# include "llfreetype2/freetype/ft2build.h"
-#endif
 
 // For some reason, this won't work if it's not wrapped in the ifdef
 #ifdef FT_FREETYPE_H
diff -Naur linden.orig/indra/llwindow/llglheaders.h linden/indra/llwindow/llglheaders.h
--- linden.orig/indra/llwindow/llglheaders.h	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llwindow/llglheaders.h	2008-05-08 16:31:20.000000000 -0600
@@ -80,7 +80,7 @@
 # include "GL/glxext.h"
 // Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
 // is considered 'legacy' but works on more machines.
-# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p))
+# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p))
 // Whee, the X headers define 'Status'.  Undefine to avoid confusion.
 #undef Status
 #endif // LL_LINUX && !LL_MESA_HEADLESS
diff -Naur linden.orig/indra/llxml/llxmlnode.h linden/indra/llxml/llxmlnode.h
--- linden.orig/indra/llxml/llxmlnode.h	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llxml/llxmlnode.h	2008-05-08 16:31:20.000000000 -0600
@@ -33,11 +33,7 @@
 #define LL_LLXMLNODE_H
 
 #define XML_STATIC
-#ifdef LL_STANDALONE
 #include <expat.h>
-#else
-#include "expat/expat.h"
-#endif
 #include <map>
 
 #include "indra_constants.h"
diff -Naur linden.orig/indra/llxml/llxmlparser.h linden/indra/llxml/llxmlparser.h
--- linden.orig/indra/llxml/llxmlparser.h	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/llxml/llxmlparser.h	2008-05-08 16:31:20.000000000 -0600
@@ -33,11 +33,7 @@
 #define LL_LLXMLPARSER_H
 
 #define XML_STATIC
-#ifdef LL_STANDALONE
 #include <expat.h>
-#else
-#include "expat/expat.h"
-#endif
 
 class LLXmlParser
 {
diff -Naur linden.orig/indra/newview/linux_tools/wrapper.sh linden/indra/newview/linux_tools/wrapper.sh
--- linden.orig/indra/newview/linux_tools/wrapper.sh	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/newview/linux_tools/wrapper.sh	2008-05-08 16:31:20.000000000 -0600
@@ -92,7 +92,7 @@
     fi
 fi
 
-export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
+export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/lib/llmozlib:"${LD_LIBRARY_PATH}"'
 export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
 export SL_OPT="`cat gridargs.dat` $@"
 
diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp
--- linden.orig/indra/newview/lluserauth.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/newview/lluserauth.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -45,7 +45,7 @@
 
 // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
 #include <curl/curl.h>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
 
 
 
diff -Naur linden.orig/indra/newview/llviewerobjectlist.cpp linden/indra/newview/llviewerobjectlist.cpp
--- linden.orig/indra/newview/llviewerobjectlist.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/newview/llviewerobjectlist.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -65,11 +65,7 @@
 #include "u64.h"
 #include "llviewerimagelist.h"
 #include "lldatapacker.h"
-#ifdef LL_STANDALONE
 #include <zlib.h>
-#else
-#include "zlib/zlib.h"
-#endif
 #include "object_flags.h"
 
 #include "llappviewer.h"
diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp
--- linden.orig/indra/newview/llvoiceclient.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/newview/llvoiceclient.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -39,7 +39,7 @@
 #include "llvoavatar.h"
 #include "llbufferstream.h"
 #include "llfile.h"
-#include "expat/expat.h"
+#include "expat.h"
 #include "llcallbacklist.h"
 #include "llviewerregion.h"
 #include "llviewernetwork.h"		// for gGridChoice
diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp
--- linden.orig/indra/newview/llxmlrpctransaction.cpp	2008-05-08 16:31:27.000000000 -0600
+++ linden/indra/newview/llxmlrpctransaction.cpp	2008-05-08 16:31:20.000000000 -0600
@@ -37,7 +37,7 @@
 #include "llviewercontrol.h"
 
 // Have to include these last to avoid queue redefinition!
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
 
 #include "llappviewer.h"