16 files changed, 406 insertions, 160 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f99ebae..6fd7771 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,19 @@
+2009-04-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Don't use LL_ERRS, it makes the viewer abort!
+
+
+        * linden/indra/llcommon/llerror.cpp:
+        Made LogLock mutex less likely to fail, hopefully.
+
+
+        * linden/indra/llcommon/llthread.cpp:
+        Converted BOOLs to bools in llthread.
+        * linden/indra/llcommon/llthread.h: 
+        Ditto.
+
+
 2009-04-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
@@ -63,12 +79,42 @@
         Added LLMediaBase::EDebugLevel and setDebugLevel prototype.
 
 
+2009-03-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Added libgstdecodebin.so plugin to Mac manifest.
+
+
 2009-03-30  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
         Cleaned up logic for bad streams.
 
 
+2009-03-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        set_gst_plugin_path now sets GST_PLUGIN_SYSTEM_PATH="".
+        This prevents GStreamer from looking for system-installed plugins,
+        which can have conflicts with our packaged ones.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Improved set_gst_plugin_path, now sets path on Mac too.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Using OpenAL framework on Mac after all. Maybe.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Tweaked the list of linked-in gstreamer libs for Mac.
+
+
+        * linden/indra/newview/viewer_manifest.py:
+        Removed the "2.0.0" named glib libs. Only using "2.0" now.
+
+
 2009-03-29  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
@@ -110,6 +156,12 @@
         Print out the plugins gstreamer finds, for debugging.
 
 
+2009-03-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/app_settings/settings.xml:
+        Changed the login splash screen URL.
+
+
 2009-03-27  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
@@ -187,12 +239,86 @@
         Ditto.
 
 
+2009-03-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Symlinks for Mac glib dylibs (2.0.0 -> 2.0).
+
+        * linden/indra/newview/viewer_manifest.py:
+        Added more Mac dylibs to manifest.
+
+
+2009-03-13  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llaudio/audioengine_openal.cpp:
+        Added error checking when generating an OpenAL source.
+
+
+2009-03-12  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/cmake/OPENAL.cmake:
+        Don't find specific OpenAL lib locations on Mac/Linux.
+        Linking that way is bad. Just use -lopenal -lalut instead.
+
+
+2009-03-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/cmake/OPENAL.cmake:
+        Removed redundant/unnecessary OpenAL lib names and paths.
+
+        * linden/indra/newview/viewer_manifest.py:
+        Added Mac gstreamer plugins to viewer manifest.
+
+        * linden/indra/llaudio/CMakeLists.txt:
+        LLAudio's CMakeLists should include OPENAL.
+
+        * linden/indra/cmake/LLMedia.cmake:
+        Removed Quicktime-related cmake code.
+        * linden/indra/cmake/LLMedia.cmake:
+        Ditto.
+        * linden/indra/llmedia/CMakeLists.txt:
+        Ditto.
+        * linden/indra/newview/CMakeLists.txt:
+        Ditto.
+
+
 2009-03-10  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llaudio/audioengine.cpp:
         Changed startinternetstream() a bit to be clearer.
 
 
+2009-03-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/viewer_manifest.py:
+        Manifest includes openal and gstreamer libs in Mac package.
+
+        * linden/indra/newview/CMakeLists.txt: 
+        Mac app icon will be called viewer.icns instead of secondlife.icns.
+        * linden/indra/newview/Info-Imprudence.plist: 
+        Ditto.
+        * linden/indra/newview/viewer_manifest.py:
+        Ditto.
+
+
+2009-03-08  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Load the proper gstreamer lib type (dylib) on Mac.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Tweaked GStreamer.cmake to work on Mac.
+
+
+2009-03-07  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/Info-SecondLife.plist:
+        Moved Info-SecondLife.plist to Info-Imprudence.plist.
+        * linden/indra/newview/viewer_manifest.py:
+        Ditto.
+
+
 2009-03-07  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llimagej2coj/llimagej2coj.cpp:
@@ -286,6 +412,7 @@
         not highlighted in script editor).
 
 
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                       1.1.0 RC2                        -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 7b380a8..c1bbc57 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -62,18 +62,36 @@ else (WINDOWS)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
 
-  set(GSTREAMER_LIBRARIES
-      gstvideo-0.10
-      gstaudio-0.10
-      gstbase-0.10
-      gstreamer-0.10
-      gobject-2.0
-      gmodule-2.0
-      dl
-      gthread-2.0
-      rt
-      glib-2.0
-      )
+  if (DARWIN)
+
+    set(GSTREAMER_LIBRARIES
+        gstvideo-0.10
+        gstaudio-0.10
+        gstbase-0.10
+        gstreamer-0.10
+        gobject-2.0
+        gmodule-2.0
+        gthread-2.0
+        glib-2.0
+        xml2
+        )
+
+  else (DARWIN)
+
+    set(GSTREAMER_LIBRARIES
+        gstvideo-0.10
+        gstaudio-0.10
+        gstbase-0.10
+        gstreamer-0.10
+        gobject-2.0
+        gmodule-2.0
+        dl
+        gthread-2.0
+        rt
+        glib-2.0
+        )
+
+  endif (DARWIN)
 
 endif (WINDOWS)
 
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
index b7bf11c..8a36a69 100644
--- a/linden/indra/cmake/LLMedia.cmake
+++ b/linden/indra/cmake/LLMedia.cmake
@@ -1,7 +1,6 @@
 # -*- cmake -*-
 
 include(GStreamer)
-include(QuickTime)
 
 set(LLMEDIA_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llmedia
@@ -11,5 +10,4 @@ set(LLMEDIA_LIBRARIES
     llmedia
     ${GSTREAMER_LIBRARIES}
     ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
-    ${QUICKTIME_LIBRARY}
     )
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 5e71f66..f06a38e 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -10,16 +10,18 @@ if (OPENAL)
   # OPENAL_LIB
 
   if (WINDOWS)
-  find_library(OPENAL_LIB
-    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
-    PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-    )
-
+    find_library(OPENAL_LIB
+      NAMES openal32
+      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+      )
+  elseif (DARWIN)
+    # Look for for system's OpenAL.framework
+    find_library(OPENAL_LIB
+      NAMES OpenAL openal
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      )
   else (WINDOWS)
-  find_library(OPENAL_LIB
-    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
-    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-    )
+    set(OPENAL_LIB openal)
   endif (WINDOWS)
   
   if (NOT OPENAL_LIB)
@@ -34,7 +36,7 @@ if (OPENAL)
 
   find_path(OPENAL_INCLUDE_DIR
     NAMES al.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL
     )
 
   if (NOT OPENAL_INCLUDE_DIR)
@@ -49,15 +51,11 @@ if (OPENAL)
 
   if (WINDOWS)
    find_library(ALUT_LIB
-   NAMES alut freealut
-   PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-   )
-  
+     NAMES alut freealut
+     PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+     )
   else (WINDOWS) 
-  find_library(ALUT_LIB
-    NAMES alut freealut
-    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-    )
+    set(ALUT_LIB alut)
   endif (WINDOWS)
 
   if (NOT ALUT_LIB)
@@ -72,7 +70,7 @@ if (OPENAL)
 
   find_path(ALUT_INCLUDE_DIR
     NAMES alut.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL
     )
 
   if (NOT ALUT_INCLUDE_DIR)
diff --git a/linden/indra/cmake/QuickTime.cmake b/linden/indra/cmake/QuickTime.cmake
deleted file mode 100644
index 4352709..0000000
--- a/linden/indra/cmake/QuickTime.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- cmake -*-
-
-if(INSTALL_PROPRIETARY)
-  include(Prebuilt)
-  use_prebuilt_binary(quicktime)
-endif(INSTALL_PROPRIETARY)
-
-if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(QUICKTIME_LIBRARY QuickTime)
-elseif (WINDOWS)
-  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
-      CACHE PATH "Location of the QuickTime SDK.")
-
-  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_DEBUG}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_RELEASE}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-    set(QUICKTIME_LIBRARY 
-        optimized ${RELEASE_QUICKTIME_LIBRARY}
-        debug ${DEBUG_QUICKTIME_LIBRARY}
-        )
-        
-  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-  
-  include_directories(
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
-    "${QUICKTIME_SDK_DIR}\\CIncludes"
-    )
-endif (DARWIN)
-
-mark_as_advanced(QUICKTIME_LIBRARY)
-
-if (QUICKTIME_LIBRARY)
-  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
-endif (QUICKTIME_LIBRARY)
-
-if (QUICKTIME)
-  add_definitions(-DLL_QUICKTIME_ENABLED=1)
-endif (QUICKTIME)
diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
index aa15a9d..8a26e54 100644
--- a/linden/indra/llaudio/CMakeLists.txt
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llaudio)
 
 include(00-Common)
 include(Audio)
+include(OPENAL)
 include(FMOD)
 include(LLCommon)
 include(LLMath)
diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp
index 8f836a6..6d9a242 100644
--- a/linden/indra/llaudio/audioengine_openal.cpp
+++ b/linden/indra/llaudio/audioengine_openal.cpp
@@ -172,6 +172,17 @@ LLAudioChannelOpenAL::LLAudioChannelOpenAL()
         mLastSamplePos(0)
 {
         alGenSources(1, &mALSource);
+
+        if( mALSource == AL_NONE )
+        {
+                ALenum error = alGetError();
+                if( error == AL_NO_ERROR )
+                {
+                        LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource, but no error is indicated!" << LL_ENDL;
+                }
+                LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource: (" << error << ") " << alGetString( error ) << LL_ENDL;
+        }
+
 }
 
 LLAudioChannelOpenAL::~LLAudioChannelOpenAL()
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 5c7c3cd..b95b325 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -902,7 +902,7 @@ namespace {
                         return;
                 }
                 
-                const int MAX_RETRIES = 5;
+                const int MAX_RETRIES = 10;
                 for (int attempts = 0; attempts < MAX_RETRIES; ++attempts)
                 {
                         apr_status_t s = apr_thread_mutex_trylock(gLogMutexp);
@@ -914,9 +914,7 @@ namespace {
                         }
 
                         ms_sleep(1);
-                        //apr_thread_yield();
-                                // Just yielding won't necessarily work, I had problems with
-                                // this on Linux - doug 12/02/04
+                        apr_thread_yield();
                 }
 
                 // We're hosed, we can't get the mutex.  Blah.
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index 822adc2..4879d58 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -84,7 +84,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
 
 
 LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
-        mPaused(FALSE),
+        mPaused(false),
         mName(name),
         mAPRThreadp(NULL),
         mStatus(STOPPED)
@@ -92,12 +92,12 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
         // Thread creation probably CAN be paranoid about APR being initialized, if necessary
         if (poolp)
         {
-                mIsLocalPool = FALSE;
+                mIsLocalPool = false;
                 mAPRPoolp = poolp;
         }
         else
         {
-                mIsLocalPool = TRUE;
+                mIsLocalPool = true;
                 apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
         }
         mRunCondition = new LLCondition(mAPRPoolp);
@@ -268,12 +268,12 @@ LLMutex::LLMutex(apr_pool_t *poolp) :
 {
         //if (poolp)
         //{
-        //      mIsLocalPool = FALSE;
+        //      mIsLocalPool = false;
         //      mAPRPoolp = poolp;
         //}
         //else
         {
-                mIsLocalPool = TRUE;
+                mIsLocalPool = true;
                 apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
         }
         apr_thread_mutex_create(&mAPRMutexp, APR_THREAD_MUTEX_UNNESTED, mAPRPoolp);
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index 9da3134..a0b22f2 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -67,7 +67,7 @@ public:
         // Called from MAIN THREAD.
         void pause();
         void unpause();
-        bool isPaused() { return isStopped() || mPaused == TRUE; }
+        bool isPaused() { return isStopped() || mPaused; }
         
         // Cause the thread to wake up and check its condition
         void wake();
@@ -84,7 +84,7 @@ public:
         apr_pool_t *getAPRPool() { return mAPRPoolp; }
         
 private:
-        BOOL                            mPaused;
+        bool                            mPaused;
         
         // static function passed to APR thread creation routine
         static void *APR_THREAD_FUNC staticRun(apr_thread_t *apr_threadp, void *datap);
@@ -95,7 +95,7 @@ protected:
 
         apr_thread_t            *mAPRThreadp;
         apr_pool_t                      *mAPRPoolp;
-        BOOL                            mIsLocalPool;
+        bool                            mIsLocalPool;
         EThreadStatus           mStatus;
 
         void setQuitting();
@@ -137,7 +137,7 @@ public:
 protected:
         apr_thread_mutex_t *mAPRMutexp;
         apr_pool_t                      *mAPRPoolp;
-        BOOL                            mIsLocalPool;
+        bool                            mIsLocalPool;
 };
 
 // Actually a condition/mutex pair (since each condition needs to be associated with a mutex).
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index 0e5b261..ea0ce1a 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -65,19 +65,6 @@ if (MOZLIB)
   list(APPEND llmedia_HEADER_FILES llmediaimplllmozlib.h)
 endif (MOZLIB)
 
-if (QUICKTIME)
-  list(APPEND llmedia_SOURCE_FILES llmediaimplquicktime.cpp)
-  list(APPEND llmedia_HEADER_FILES llmediaimplquicktime.h)
-
-  # We use a bunch of deprecated system APIs.
-  if (DARWIN)
-    set_source_files_properties(
-        llmediaimplquicktime.cpp PROPERTIES
-        COMPILE_FLAGS -Wno-deprecated-declarations
-        )
-  endif (DARWIN)
-endif (QUICKTIME)
-
 set_source_files_properties(${llmedia_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 7ae6b02..7eb2b7b 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -60,6 +60,10 @@ extern "C" {
 #include "llgstplaythread.h"
 
 
+#if LL_DARWIN
+#include <CoreFoundation/CoreFoundation.h>  // For CF functions used in set_gst_plugin_path
+#endif
+
 // register this impl with media manager factory
 static LLMediaImplRegister sLLMediaImplGStreamerReg( "LLMediaImplGStreamer", new LLMediaImplGStreamerMaker() );
 
@@ -223,61 +227,111 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
 
 void LLMediaImplGStreamer::set_gst_plugin_path()
 {
-        // Only needed for Windows.
-        // Linux sets in wrapper.sh, Mac sets in Info-Imprudence.plist
-#ifdef LL_WINDOWS
+        // Linux sets GST_PLUGIN_PATH in wrapper.sh, not here.
+#if LL_WINDOWS || LL_DARWIN
 
-        char* imp_cwd;
+        std::string imp_dir = "";
 
         // Get the current working directory: 
-        imp_cwd = _getcwd(NULL,0);
+#if LL_WINDOWS
+        char* raw_dir;
+        raw_dir = _getcwd(NULL,0);
+        if( raw_dir != NULL )
+        {
+                imp_dir = std::string( raw_dir );
+        }
+#elif LL_DARWIN
+        CFBundleRef main_bundle = CFBundleGetMainBundle();
+        if( main_bundle != NULL )
+        {
+                CFURLRef bundle_url = CFBundleCopyBundleURL( main_bundle );
+                if( bundle_url != NULL )
+                {
+                        #ifndef MAXPATHLEN
+                        #define MAXPATHLEN 1024
+                        #endif
+                        char raw_dir[MAXPATHLEN];
+                        if( CFURLGetFileSystemRepresentation( bundle_url, true, (UInt8 *)raw_dir, MAXPATHLEN) )
+                        {
+                                imp_dir = std::string( raw_dir ) + "/Contents/MacOS/";
+                        }
+                        CFRelease(bundle_url);
+                }
+        }
+#endif
+
+        if( imp_dir == "" )
+        {
+                LL_WARNS("MediaImpl") << "Could not get application directory, not setting GST_PLUGIN_PATH."
+                                      << LL_ENDL;
+                return;
+        }
 
-        if(imp_cwd == NULL)
+        LL_DEBUGS("MediaImpl") << "Imprudence is installed at "
+                               << imp_dir << LL_ENDL;
+
+        // ":" on Mac and 'Nix, ";" on Windows
+        std::string separator = G_SEARCHPATH_SEPARATOR_S;
+
+        // Grab the current path, if it's set.
+        std::string old_plugin_path = "";
+        char *old_path = getenv("GST_PLUGIN_PATH");
+        if(old_path == NULL)
         {
-                LL_DEBUGS("MediaImpl") << "_getcwd failed, not setting GST_PLUGIN_PATH."
-                                         << LL_ENDL;
+                LL_DEBUGS("MediaImpl") << "Did not find user-set GST_PLUGIN_PATH."
+                                       << LL_ENDL;
         }
         else
         {
-                LL_DEBUGS("MediaImpl") << "Imprudence is installed at "
-                                         << imp_cwd << LL_ENDL;
+                old_plugin_path = separator + std::string( old_path );
+        }
 
-                // Grab the current path, if it's set.
-                std::string old_plugin_path = "";
-                char *old_path = getenv("GST_PLUGIN_PATH");
-                if(old_path == NULL)
-                {
-                        LL_DEBUGS("MediaImpl") << "Did not find user-set GST_PLUGIN_PATH."
-                                                 << LL_ENDL;
-                }
-                else
-                {
-                        old_plugin_path = ";" + std::string( old_path );
-                }
 
+        // Search both Imprudence and Imprudence\lib\gstreamer-plugins.
+        // But we also want to search the path the user has set, if any.
+        std::string plugin_path =       
+                "GST_PLUGIN_PATH=" +
+                imp_dir + separator +
+#if LL_WINDOWS
+                imp_dir + "\\lib\\gstreamer-plugins" +
+#elif LL_DARWIN
+                imp_dir + "/../Resources/lib/gstreamer-plugins" +
+#endif
+                old_plugin_path;
 
-                // Search both Imprudence and Imprudence\lib\gstreamer-plugins.
-                // If those fail, search the path the user has set, if any.
-                std::string plugin_path =
-                  "GST_PLUGIN_PATH=" +
-                  std::string(imp_cwd) + "\\lib\\gstreamer-plugins;" +
-                  std::string(imp_cwd) +
-                  old_plugin_path;
+        int put_result;
 
-                // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
-                // Returns 0 on success
-                if(_putenv( (char*)plugin_path.c_str() ))
-                {       
-                        LL_WARNS("MediaImpl") << "Setting environment variable failed!" << LL_ENDL;
-                }
-                else
-                {
-                        LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to "
-                                                                         << getenv("GST_PLUGIN_PATH") << LL_ENDL;
-                }
+        // Place GST_PLUGIN_PATH in the environment settings
+#if LL_WINDOWS
+        put_result = _putenv( (char*)plugin_path.c_str() );
+#elif LL_DARWIN
+        put_result = putenv( (char*)plugin_path.c_str() );
+#endif
+
+        if( put_result == -1 )
+        {
+                LL_WARNS("MediaImpl") << "Setting GST_PLUGIN_PATH failed!" << LL_ENDL;
+        }
+        else
+        {
+                LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to "
+                                       << getenv("GST_PLUGIN_PATH") << LL_ENDL;
         }
+                
+        // Don't load system plugins. We only want to use ours, to avoid conflicts.
+#if LL_WINDOWS
+        put_result = _putenv( "GST_PLUGIN_SYSTEM_PATH=\"\"" );
+#elif LL_DARWIN
+        put_result = putenv( "GST_PLUGIN_SYSTEM_PATH=\"\"" );
+#endif
 
-#endif //LL_WINDOWS
+        if( put_result == -1 )
+        {
+                LL_WARNS("MediaImpl") << "Setting GST_PLUGIN_SYSTEM_PATH=\"\" failed!"
+                                      << LL_ENDL;
+        }
+                
+#endif // LL_WINDOWS || LL_DARWIN
 }
 
 
@@ -303,7 +357,7 @@ void LLMediaImplGStreamer::gstreamer_log(GstDebugCategory *category,
         switch( level )
         {
                 case GST_LEVEL_ERROR:
-                        LL_ERRS("MediaImpl") << log.str() << LL_ENDL;
+                        LL_WARNS("MediaImpl") << "(ERROR) " << log.str() << LL_ENDL;
                         break;
                 case GST_LEVEL_WARNING:
                         LL_WARNS("MediaImpl") << log.str() << LL_ENDL;
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1e48d28..f971f97 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -849,7 +849,7 @@ if (DARWIN)
 
   # Add resource files to the project.
   set(viewer_RESOURCE_FILES
-    secondlife.icns
+    viewer.icns
     macview.r
     gpu_table.txt
     Info-Imprudence.plist
@@ -1393,7 +1393,6 @@ target_link_libraries(imprudence-bin
     ${SMARTHEAP_LIBRARY}
     ${UI_LIBRARIES}
     ${NDOF_LIBRARY}
-    ${QUICKTIME_LIBRARY}
     ${WINDOWS_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
     ${ZLIB_LIBRARIES}
@@ -1447,7 +1446,7 @@ if (DARWIN)
     PROPERTIES
     OUTPUT_NAME "${product}"
     MACOSX_BUNDLE_INFO_STRING "info string - localize me"
-    MACOSX_BUNDLE_ICON_FILE "secondlife.icns"
+    MACOSX_BUNDLE_ICON_FILE "viewer.icns"
     MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence"
     MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
     MACOSX_BUNDLE_BUNDLE_NAME "Imprudence"
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-Imprudence.plist
index 32bba70..357d171 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -7,7 +7,7 @@
         <key>CFBundleExecutable</key>

         <string>Imprudence</string>

         <key>CFBundleIconFile</key>

-        <string>secondlife.icns</string>

+        <string>viewer.icns</string>

         <key>CFBundleIdentifier</key>

         <string>com.secondlife.indra.viewer</string>

         <key>CFBundleInfoDictionaryVersion</key>

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1ecab2b..55ff208 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4459,7 +4459,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string />
+      <string>http://imprudenceviewer.org/splash/</string>
     </map>
     <key>LosslessJ2CUpload</key>
     <map>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3583726..71c07b6 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -403,10 +403,51 @@ class DarwinManifest(ViewerManifest):
             #  <bundle>/Contents/MacOS/
             self.contents_of_tar(self.args['source']+'/mozilla-universal-darwin.tgz', 'MacOS')
 
-            self.path("Info-SecondLife.plist", dst="Info.plist")
+            self.path("Info-Imprudence.plist", dst="Info.plist")
 
             # copy additional libs in <bundle>/Contents/MacOS/
-            self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
+            if self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"):
+
+                self.path("libndofdev.dylib")
+                
+                self.path("libopenal.1.dylib")
+                self.path("libalut.0.dylib")
+
+                self.path("libglib-2.0.dylib")
+                self.path("libgmodule-2.0.dylib")
+                self.path("libgobject-2.0.dylib")
+                self.path("libgthread-2.0.dylib")
+                
+                self.path("libgstreamer-0.10.dylib")
+                self.path("libgstapp-0.10.dylib")
+                self.path("libgstaudio-0.10.dylib")
+                self.path("libgstbase-0.10.dylib")
+                self.path("libgstcdda-0.10.dylib")
+                self.path("libgstcontroller-0.10.dylib")
+                self.path("libgstdataprotocol-0.10.dylib")
+                self.path("libgstfft-0.10.dylib")
+                self.path("libgstinterfaces-0.10.dylib")
+                self.path("libgstnet-0.10.dylib")
+                self.path("libgstnetbuffer-0.10.dylib")
+                self.path("libgstpbutils-0.10.dylib")
+                self.path("libgstriff-0.10.dylib")
+                self.path("libgstrtp-0.10.dylib")
+                self.path("libgstrtsp-0.10.dylib")
+                self.path("libgstsdp-0.10.dylib")
+                self.path("libgsttag-0.10.dylib")
+                self.path("libgstvideo-0.10.dylib")
+
+                self.path("libintl.3.dylib")
+                self.path("libjpeg.62.dylib")
+                self.path("libogg.0.dylib")
+                self.path("liboil-0.3.0.dylib")
+                self.path("libpango-1.0.0.dylib")
+                self.path("libpangoft2-1.0.0.dylib")
+                self.path("libtheora.0.dylib")
+                self.path("libvorbis.0.dylib")
+                self.path("libvorbisenc.2.dylib")
+
+                self.end_prefix("../../libraries/universal-darwin/lib_release")
 
             # replace the default theme with our custom theme (so scrollbars work).
             if self.prefix(src="mozilla-theme", dst="MacOS/chrome"):
@@ -432,7 +473,7 @@ class DarwinManifest(ViewerManifest):
                 self.path("featuretable_mac.txt")
                 self.path("SecondLife.nib")
 
-                self.path("secondlife.icns")
+                self.path("viewer.icns")
                 
                 # Translations
                 self.path("English.lproj")
@@ -441,9 +482,72 @@ class DarwinManifest(ViewerManifest):
                 self.path("Korean.lproj")
 
 
+                if self.prefix(src="../../libraries/universal-darwin/lib_release/gstreamer-plugins", dst="lib/gstreamer-plugins"):
+                    self.path("libgstaacparse.so")
+                    self.path("libgstadder.so")
+                    self.path("libgstaiffparse.so")
+                    self.path("libgstamrparse.so")
+                    self.path("libgstapp.so")
+                    self.path("libgstaudioconvert.so")
+                    self.path("libgstaudiorate.so")
+                    self.path("libgstaudioresample.so")
+                    self.path("libgstautodetect.so")
+                    self.path("libgstavi.so")
+                    self.path("libgstcoreelements.so")
+                    self.path("libgstcoreindexers.so")
+                    self.path("libgstdebug.so")
+                    self.path("libgstdecodebin.so")
+                    self.path("libgstdecodebin2.so")
+                    self.path("libgstdeinterlace2.so")
+                    self.path("libgstequalizer.so")
+                    self.path("libgstffmpeg.so")
+                    self.path("libgstffmpegcolorspace.so")
+                    self.path("libgstffmpegscale.so")
+                    self.path("libgstflac.so")
+                    self.path("libgstflv.so")
+                    self.path("libgstgdp.so")
+                    self.path("libgsth264parse.so")
+                    self.path("libgsticydemux.so")
+                    self.path("libgstid3demux.so")
+                    self.path("libgstinterleave.so")
+                    self.path("libgstjpeg.so")
+                    self.path("libgstlevel.so")
+                    self.path("libgstmetadata.so")
+                    self.path("libgstmpeg4videoparse.so")
+                    self.path("libgstmpegdemux.so")
+                    self.path("libgstmpegvideoparse.so")
+                    self.path("libgstmultipart.so")
+                    self.path("libgstneonhttpsrc.so")
+                    self.path("libgstogg.so")
+                    self.path("libgstosxaudio.so")
+                    self.path("libgstosxvideosink.so")
+                    self.path("libgstpango.so")
+                    self.path("libgstplaybin.so")
+                    self.path("libgstpng.so")
+                    self.path("libgstpostproc.so")
+                    self.path("libgstqtdemux.so")
+                    self.path("libgstqueue2.so")
+                    self.path("libgstreal.so")
+                    self.path("libgstrtp.so")
+                    self.path("libgstrtpmanager.so")
+                    self.path("libgstrtsp.so")
+                    self.path("libgstsdpelem.so")
+                    self.path("libgstselector.so")
+                    self.path("libgsttcp.so")
+                    self.path("libgsttheora.so")
+                    self.path("libgsttypefindfunctions.so")
+                    self.path("libgstudp.so")
+                    self.path("libgstvideoscale.so")
+                    self.path("libgstvolume.so")
+                    self.path("libgstvorbis.so")
+                    self.path("libgstwavparse.so")
+                    
+                    self.end_prefix("../../libraries/universal-darwin/lib_release/gstreamer-plugins")
+
+
                 # SLVoice and vivox lols
-                self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
-                self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
+                #self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
+                #self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
                 #self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
                 #self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
                 #self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")