Merge branch 'weekly' into webkit_plugins

Conflicts:
	linden/indra/cmake/GStreamer.cmake

linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to
use system libs, so any improvements that have been made in weekly have
been invane.

	linden/indra/newview/llstartup.cpp

Trivial #include collision. One include added another removed. Fixed.

	linden/indra/newview/lltoolpie.cpp

Collision with RLV, pretty trivial. Fixed.

	linden/indra/newview/viewer_manifest.py

Trivial White space fix collision with commenting out of gstreamer libs. Fixed.

2 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 7db62bc..3c6cd43 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -870,6 +870,7 @@ void LLStringUtilBase<T>::addCRLF(std::basic_string<T>& string)
                 }
 
                 string.assign(t, size);
+                delete[] t;
         }
 }
 
diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h
index af0b4dd..aed1e46 100644
--- a/linden/indra/llcommon/stdtypes.h
+++ b/linden/indra/llcommon/stdtypes.h
@@ -64,10 +64,17 @@ typedef long long unsigned int		U64;
 #endif
 #endif
 
+#ifdef LL_DARWIN
+        #ifndef BOOL
+                #define BOOL S32
+        #endif
+#else
+        typedef S32                             BOOL;
+#endif
+
 typedef float                           F32;
 typedef double                          F64;
 
-typedef S32                             BOOL;
 typedef U8                              KEY;
 typedef U32                             MASK;
 typedef U32                             TPACKETID;