Merge branch 'mac-1.1.0' into next

Required substantial portability changes to set_gst_plugin_path().

Conflicts:
	linden/indra/llmedia/llmediaimplgstreamer.cpp

1 files changed, 2 insertions, 3 deletions

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"