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.

1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 2bc62fb..fd8d128 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -73,7 +73,13 @@ typedef enum e_image_codec
         IMG_CODEC_JPEG = 5,
         IMG_CODEC_DXT  = 6,
         IMG_CODEC_PNG  = 7,
+#ifdef LL_DARWIN
+        IMG_CODEC_PSD = 8,
+        IMG_CODEC_TIFF = 9,
+        IMG_CODEC_EOF  = 10
+#else
         IMG_CODEC_EOF  = 8
+#endif
 } EImageCodec;
 
 //============================================================================