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, 2 insertions, 2 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index cd1e98d..b8a4794 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -248,7 +248,7 @@ std::string LLDir::buildSLOSCacheDir() const
         }
         else
         {
-                res = getOSCacheDir() + mDirDelimiter + "Imprudence";
+                res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental";
         }
         return res;
 }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index a45c1ed..29cac58 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac()
                 if (error == noErr)
                 {
                         FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL);
                 }
                 
                 // mOSUserAppDir