From d5cfd302587a6eaaafc2a5d06763b1b9366a7873 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 7 Mar 2009 22:07:58 -0600 Subject: Moved Info-SecondLife.plist to Info-Imprudence.plist --- linden/indra/newview/Info-Imprudence.plist | 39 ++++++++++++++++++++++++++++++ linden/indra/newview/Info-SecondLife.plist | 39 ------------------------------ linden/indra/newview/viewer_manifest.py | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 linden/indra/newview/Info-Imprudence.plist delete mode 100644 linden/indra/newview/Info-SecondLife.plist (limited to 'linden/indra') diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist new file mode 100644 index 0000000..32bba70 --- /dev/null +++ b/linden/indra/newview/Info-Imprudence.plist @@ -0,0 +1,39 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Imprudence + CFBundleIconFile + secondlife.icns + CFBundleIdentifier + com.secondlife.indra.viewer + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Imprudence + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLName + Second Life URL + CFBundleURLSchemes + + secondlife + + LSIsAppleDefaultForScheme + + + + CFBundleVersion + 1.0.0 + CSResourcesFileMapped + + + diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist deleted file mode 100644 index 32bba70..0000000 --- a/linden/indra/newview/Info-SecondLife.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Imprudence - CFBundleIconFile - secondlife.icns - CFBundleIdentifier - com.secondlife.indra.viewer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Imprudence - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLName - Second Life URL - CFBundleURLSchemes - - secondlife - - LSIsAppleDefaultForScheme - - - - CFBundleVersion - 1.0.0 - CSResourcesFileMapped - - - diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 3583726..ba4c8a2 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -403,7 +403,7 @@ class DarwinManifest(ViewerManifest): # /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 /Contents/MacOS/ self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") -- cgit v1.1 From 94ba8cdc2ab88697abb339829590776ec9b2843e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 8 Mar 2009 14:59:57 -0500 Subject: Tweaked GStreamer.cmake to work on Mac --- linden/indra/cmake/GStreamer.cmake | 44 ++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index b4b984d..8467dcd 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -54,10 +54,6 @@ if (WINDOWS) else (WINDOWS) - include(FindPkgConfig) - - pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10) - pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10) set(GSTREAMER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 @@ -66,16 +62,36 @@ else (WINDOWS) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 ) - # We don't need to explicitly link against gstreamer itself, because - # LLMediaImplGStreamer probes for the system's copy at runtime. - set(GSTREAMER_LIBRARIES - gobject-2.0 - gmodule-2.0 - dl - gthread-2.0 - rt - glib-2.0 - ) + if (DARWIN) + + set(GSTREAMER_LIBRARIES + xml2 + glib-2.0 + gobject-2.0 + gmodule-2.0 + gthread-2.0 + gstreamer-0.10 + ) + + else (DARWIN) + + include(FindPkgConfig) + + pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10) + pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10) + + # We don't need to explicitly link against gstreamer itself, because + # LLMediaImplGStreamer probes for the system's copy at runtime. + set(GSTREAMER_LIBRARIES + gobject-2.0 + gmodule-2.0 + dl + gthread-2.0 + rt + glib-2.0 + ) + + endif (DARWIN) endif (WINDOWS) -- cgit v1.1 From 1ca12fe0e8ddf29538d8c0462a337e99395db8d9 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 8 Mar 2009 23:50:56 -0500 Subject: Load the proper gstreamer lib type (dylib) on Mac --- linden/indra/llmedia/llmediaimplgstreamer.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 30706f1..cd6c91b 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -166,19 +166,26 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data) g_type_init(); // Get symbols! + if ( #if LL_WINDOWS - if (! grab_gst_syms("libgstreamer-0.10.dll", "libgstvideo-0.10.dll", "libgstaudio-0.10.dll") ) - { - LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; - return false; - } + ! grab_gst_syms("libgstreamer-0.10.dll", + "libgstvideo-0.10.dll", + "libgstaudio-0.10.dll") +#elif LL_DARWIN + ! grab_gst_syms("libgstreamer-0.10.dylib", + "libgstvideo-0.10.dylib", + "libgstaudio-0.10.dylib") #else - if (! grab_gst_syms("libgstreamer-0.10.so.0", "libgstvideo-0.10.so.0", "libgstaudio-0.10.so.0") ) + ! grab_gst_syms("libgstreamer-0.10.so.0", + "libgstvideo-0.10.so.0", + "libgstaudio-0.10.so.0") +#endif + ) { - LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; + LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; return false; } -#endif + if (llgst_segtrap_set_enabled) llgst_segtrap_set_enabled(FALSE); else -- cgit v1.1 From f440829158cb6a78322d13237b00a08c6437705f Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 9 Mar 2009 23:56:20 -0500 Subject: Mac app icon will be called viewer.icns instead of secondlife.icns --- linden/indra/newview/CMakeLists.txt | 4 ++-- linden/indra/newview/Info-Imprudence.plist | 2 +- linden/indra/newview/viewer_manifest.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 1e48d28..2bda223 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 @@ -1447,7 +1447,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-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist index 32bba70..357d171 100644 --- a/linden/indra/newview/Info-Imprudence.plist +++ b/linden/indra/newview/Info-Imprudence.plist @@ -7,7 +7,7 @@ CFBundleExecutable Imprudence CFBundleIconFile - secondlife.icns + viewer.icns CFBundleIdentifier com.secondlife.indra.viewer CFBundleInfoDictionaryVersion diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index ba4c8a2..acc7fba 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -432,7 +432,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") -- cgit v1.1 From a593806bf4c43afab52af1ee5bbd792de1ca26f1 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 9 Mar 2009 23:59:00 -0500 Subject: Manifest includes openal and gstreamer libs in Mac package --- linden/indra/newview/viewer_manifest.py | 38 ++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index acc7fba..259249a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -406,7 +406,39 @@ class DarwinManifest(ViewerManifest): self.path("Info-Imprudence.plist", dst="Info.plist") # copy additional libs in /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("libintl.3.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.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"): @@ -442,8 +474,8 @@ class DarwinManifest(ViewerManifest): # 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") -- cgit v1.1 From 629af1f4df0f1df3c3258e1eb21ee9966171ab3d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 14:16:02 -0500 Subject: Removed Quicktime-related cmake code --- linden/indra/cmake/LLMedia.cmake | 2 -- linden/indra/cmake/QuickTime.cmake | 49 ------------------------------------- linden/indra/llmedia/CMakeLists.txt | 13 ---------- linden/indra/newview/CMakeLists.txt | 1 - 4 files changed, 65 deletions(-) delete mode 100644 linden/indra/cmake/QuickTime.cmake (limited to 'linden/indra') 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/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/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt index 026afc1..084a80b 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/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 2bda223..f971f97 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -1393,7 +1393,6 @@ target_link_libraries(imprudence-bin ${SMARTHEAP_LIBRARY} ${UI_LIBRARIES} ${NDOF_LIBRARY} - ${QUICKTIME_LIBRARY} ${WINDOWS_LIBRARIES} ${XMLRPCEPI_LIBRARIES} ${ZLIB_LIBRARIES} -- cgit v1.1 From e8a3a66bfadcbdac11f2cd542a2e0c4e137f14f4 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 16:58:26 -0500 Subject: LLAudio's CMakeLists should include OPENAL --- linden/indra/llaudio/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'linden/indra') 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) -- cgit v1.1 From 2ab904cf8765c339acca3979f6acc0ed4d5e1604 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 17:46:33 -0500 Subject: Added Mac gstreamer plugins to viewer manifest --- linden/indra/newview/viewer_manifest.py | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'linden/indra') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 259249a..1d81ebd 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -473,6 +473,68 @@ 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("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") -- cgit v1.1 From 3f9182bfc935860d523a1a2c5917409138813e0f Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 20:39:15 -0500 Subject: Better indentation in OPENAL.cmake. --- linden/indra/cmake/OPENAL.cmake | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 5e71f66..a5e966f 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -10,16 +10,15 @@ 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 openal openal32 OpenAL OpenAL32 wrap_oal + PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release + ) else (WINDOWS) - find_library(OPENAL_LIB - NAMES openal openal32 OpenAL OpenAL32 wrap_oal - PATHS ${ARCH_PREBUILT_DIRS_RELEASE} - ) + find_library(OPENAL_LIB + NAMES openal openal32 OpenAL OpenAL32 wrap_oal + PATHS ${ARCH_PREBUILT_DIRS_RELEASE} + ) endif (WINDOWS) if (NOT OPENAL_LIB) @@ -49,15 +48,14 @@ 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} - ) + find_library(ALUT_LIB + NAMES alut freealut + PATHS ${ARCH_PREBUILT_DIRS_RELEASE} + ) endif (WINDOWS) if (NOT ALUT_LIB) -- cgit v1.1 From 51081c09ae8d186c1ca5e61d19a73e01b8120c8a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 20:41:00 -0500 Subject: Removed redundant/unnecessary OpenAL lib names and paths --- linden/indra/cmake/OPENAL.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index a5e966f..2ebee01 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -11,12 +11,12 @@ if (OPENAL) if (WINDOWS) find_library(OPENAL_LIB - NAMES openal openal32 OpenAL OpenAL32 wrap_oal + NAMES openal32 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) else (WINDOWS) find_library(OPENAL_LIB - NAMES openal openal32 OpenAL OpenAL32 wrap_oal + NAMES openal PATHS ${ARCH_PREBUILT_DIRS_RELEASE} ) endif (WINDOWS) @@ -33,7 +33,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) @@ -53,7 +53,7 @@ if (OPENAL) ) else (WINDOWS) find_library(ALUT_LIB - NAMES alut freealut + NAMES alut PATHS ${ARCH_PREBUILT_DIRS_RELEASE} ) endif (WINDOWS) @@ -70,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) -- cgit v1.1 From 4932af1c6806c351aa687433c10ba57d2a502c59 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 12 Mar 2009 09:16:53 -0500 Subject: Don't find specific OpenAL lib locations on Mac/Linux. Linking that way is bad. Just use -lopenal -lalut instead. --- linden/indra/cmake/OPENAL.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 2ebee01..11dcdc7 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -15,10 +15,7 @@ if (OPENAL) PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) else (WINDOWS) - find_library(OPENAL_LIB - NAMES openal - PATHS ${ARCH_PREBUILT_DIRS_RELEASE} - ) + set(OPENAL_LIB openal) endif (WINDOWS) if (NOT OPENAL_LIB) @@ -52,10 +49,7 @@ if (OPENAL) PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) else (WINDOWS) - find_library(ALUT_LIB - NAMES alut - PATHS ${ARCH_PREBUILT_DIRS_RELEASE} - ) + set(ALUT_LIB alut) endif (WINDOWS) if (NOT ALUT_LIB) -- cgit v1.1 From 7ee91c387e3d530c721a0bbbb2343bbce4b27730 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 13 Mar 2009 21:39:24 -0500 Subject: Added error checking when generating an OpenAL source --- linden/indra/llaudio/audioengine_openal.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'linden/indra') 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() -- cgit v1.1 From 0723652717a0ece33dffab6fea884ffd55b43611 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 16 Mar 2009 04:05:54 -0500 Subject: Added more Mac dylibs to manifest. --- linden/indra/newview/viewer_manifest.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 1d81ebd..69f4d20 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -417,7 +417,6 @@ class DarwinManifest(ViewerManifest): self.path("libgmodule-2.0.dylib") self.path("libgobject-2.0.dylib") self.path("libgthread-2.0.dylib") - self.path("libintl.3.dylib") self.path("libgstreamer-0.10.dylib") self.path("libgstapp-0.10.dylib") @@ -438,6 +437,16 @@ class DarwinManifest(ViewerManifest): 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). -- cgit v1.1 From dfdf5dab6e58fced71eb1dda99029308af480cb5 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 16 Mar 2009 04:32:13 -0500 Subject: Symlinks for Mac glib dylibs (2.0.0 -> 2.0). --- linden/indra/newview/viewer_manifest.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linden/indra') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 69f4d20..637f07a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -413,6 +413,12 @@ class DarwinManifest(ViewerManifest): self.path("libopenal.1.dylib") self.path("libalut.0.dylib") + self.path("libglib-2.0.0.dylib") + self.path("libgmodule-2.0.0.dylib") + self.path("libgobject-2.0.0.dylib") + self.path("libgthread-2.0.0.dylib") + + # Symlinks to satisfy different name dependencies. self.path("libglib-2.0.dylib") self.path("libgmodule-2.0.dylib") self.path("libgobject-2.0.dylib") -- cgit v1.1 From 5bd80f31b2a6d06f6b84e444ed84b744bfebc311 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 26 Mar 2009 16:22:44 -0500 Subject: Converted all skin XML files to Unix LF line endings. --- .../newview/skins/default/xui/de/LCD_text.xml | 150 +- .../default/xui/de/floater_active_speakers.xml | 26 +- .../skins/default/xui/de/floater_audio_volume.xml | 8 +- .../skins/default/xui/de/floater_camera.xml | 24 +- .../skins/default/xui/de/floater_chatterbox.xml | 4 +- .../default/xui/de/floater_day_cycle_options.xml | 192 +- .../default/xui/de/floater_device_settings.xml | 4 +- .../skins/default/xui/de/floater_env_settings.xml | 48 +- .../default/xui/de/floater_hardware_settings.xml | 80 +- .../newview/skins/default/xui/de/floater_hud.xml | 4 +- .../skins/default/xui/de/floater_inspect.xml | 28 +- .../xui/de/floater_instant_message_ad_hoc.xml | 114 +- .../xui/de/floater_instant_message_group.xml | 158 +- .../skins/default/xui/de/floater_joystick.xml | 152 +- .../skins/default/xui/de/floater_lagmeter.xml | 304 +- .../skins/default/xui/de/floater_landmark_ctrl.xml | 20 +- .../skins/default/xui/de/floater_lsl_guide.xml | 14 +- .../skins/default/xui/de/floater_media_browser.xml | 38 +- .../skins/default/xui/de/floater_mem_leaking.xml | 36 +- .../skins/default/xui/de/floater_mute_object.xml | 24 +- .../skins/default/xui/de/floater_my_friends.xml | 14 +- .../skins/default/xui/de/floater_post_process.xml | 106 +- .../default/xui/de/floater_preview_classified.xml | 4 +- .../skins/default/xui/de/floater_preview_event.xml | 4 +- .../skins/default/xui/de/floater_preview_url.xml | 4 +- .../skins/default/xui/de/floater_region_info.xml | 4 +- .../skins/default/xui/de/floater_select_key.xml | 16 +- .../default/xui/de/floater_sim_release_message.xml | 32 +- .../xui/de/floater_skin_preview_template.xml | 70 +- .../newview/skins/default/xui/de/floater_test.xml | 4 +- .../skins/default/xui/de/floater_url_entry.xml | 26 +- .../skins/default/xui/de/floater_voice_wizard.xml | 18 +- .../newview/skins/default/xui/de/floater_water.xml | 176 +- .../default/xui/de/floater_windlight_options.xml | 380 +- .../newview/skins/default/xui/de/menu_login.xml | 26 +- .../newview/skins/default/xui/de/menu_slurl.xml | 12 +- .../newview/skins/default/xui/de/mime_types.xml | 460 +- .../newview/skins/default/xui/de/need_to_long.xml | 356 +- .../skins/default/xui/de/need_to_translate.xml | 2466 ++--- .../skins/default/xui/de/need_to_update.xml | 1250 +-- .../newview/skins/default/xui/de/panel_audio.xml | 22 +- .../skins/default/xui/de/panel_audio_device.xml | 50 +- .../newview/skins/default/xui/de/panel_friends.xml | 82 +- .../newview/skins/default/xui/de/panel_groups.xml | 30 +- .../skins/default/xui/de/panel_master_volume.xml | 12 +- .../skins/default/xui/de/panel_media_controls.xml | 76 +- .../default/xui/de/panel_media_remote_expanded.xml | 56 +- .../skins/default/xui/de/panel_preferences_LCD.xml | 60 +- .../default/xui/de/panel_preferences_skins.xml | 28 +- .../default/xui/de/panel_preferences_voice.xml | 80 +- .../skins/default/xui/de/panel_preferences_web.xml | 62 +- .../default/xui/de/panel_speaker_controls.xml | 82 +- .../skins/default/xui/de/panel_voice_controls.xml | 24 +- .../skins/default/xui/de/panel_voice_enable.xml | 46 +- .../skins/default/xui/de/panel_voice_options.xml | 48 +- .../skins/default/xui/de/panel_voice_remote.xml | 18 +- .../default/xui/de/panel_voice_remote_expanded.xml | 8 +- .../indra/newview/skins/default/xui/de/strings.xml | 886 +- .../skins/default/xui/de/teleport_strings.xml | 180 +- .../default/xui/en-us/floater_active_speakers.xml | 58 +- .../skins/default/xui/en-us/floater_chatterbox.xml | 24 +- .../default/xui/en-us/floater_device_settings.xml | 14 +- .../skins/default/xui/en-us/floater_hud.xml | 24 +- .../skins/default/xui/en-us/floater_inspect.xml | 48 +- .../skins/default/xui/en-us/floater_lagmeter.xml | 400 +- .../skins/default/xui/en-us/floater_lsl_guide.xml | 42 +- .../skins/default/xui/en-us/floater_my_friends.xml | 26 +- .../default/xui/en-us/floater_region_info.xml | 14 +- .../skins/default/xui/en-us/floater_select_key.xml | 30 +- .../xui/en-us/floater_sim_release_message.xml | 42 +- .../default/xui/en-us/floater_voice_wizard.xml | 38 +- .../skins/default/xui/en-us/panel_audio_device.xml | 120 +- .../newview/skins/default/xui/en-us/panel_bars.xml | 42 +- .../skins/default/xui/en-us/panel_bg_tab.xml | 14 +- .../skins/default/xui/en-us/panel_bg_toolbar.xml | 14 +- .../skins/default/xui/en-us/panel_friends.xml | 86 +- .../xui/en-us/panel_media_remote_expanded.xml | 66 +- .../default/xui/en-us/panel_preferences_skins.xml | 44 +- .../default/xui/en-us/panel_preferences_voice.xml | 162 +- .../default/xui/en-us/panel_speaker_controls.xml | 140 +- .../default/xui/en-us/panel_voice_controls.xml | 38 +- .../skins/default/xui/en-us/panel_voice_enable.xml | 72 +- .../default/xui/en-us/panel_voice_options.xml | 86 +- .../skins/default/xui/en-us/panel_voice_remote.xml | 16 +- .../xui/en-us/panel_voice_remote_expanded.xml | 40 +- .../indra/newview/skins/default/xui/es/alerts.xml | 8258 ++++++++--------- .../newview/skins/default/xui/es/floater_about.xml | 8 +- .../skins/default/xui/es/floater_about_land.xml | 688 +- .../default/xui/es/floater_animation_preview.xml | 318 +- .../skins/default/xui/es/floater_auction.xml | 36 +- .../skins/default/xui/es/floater_avatar_picker.xml | 30 +- .../default/xui/es/floater_avatar_textures.xml | 60 +- .../skins/default/xui/es/floater_build_options.xml | 14 +- .../newview/skins/default/xui/es/floater_bumps.xml | 42 +- .../skins/default/xui/es/floater_buy_contents.xml | 24 +- .../skins/default/xui/es/floater_buy_currency.xml | 124 +- .../skins/default/xui/es/floater_buy_land.xml | 452 +- .../skins/default/xui/es/floater_buy_object.xml | 22 +- .../skins/default/xui/es/floater_chat_history.xml | 12 +- .../skins/default/xui/es/floater_choose_group.xml | 16 +- .../skins/default/xui/es/floater_clothing.xml | 18 +- .../skins/default/xui/es/floater_color_picker.xml | 62 +- .../skins/default/xui/es/floater_critical.xml | 22 +- .../skins/default/xui/es/floater_customize.xml | 956 +- .../skins/default/xui/es/floater_directory.xml | 596 +- .../skins/default/xui/es/floater_gesture.xml | 36 +- .../skins/default/xui/es/floater_god_tools.xml | 294 +- .../skins/default/xui/es/floater_group_info.xml | 554 +- .../newview/skins/default/xui/es/floater_im.xml | 18 +- .../skins/default/xui/es/floater_image_preview.xml | 96 +- .../skins/default/xui/es/floater_import.xml | 34 +- .../default/xui/es/floater_instant_message.xml | 36 +- .../skins/default/xui/es/floater_inventory.xml | 96 +- .../xui/es/floater_inventory_item_properties.xml | 146 +- .../xui/es/floater_inventory_view_finder.xml | 48 +- .../skins/default/xui/es/floater_land_holdings.xml | 76 +- .../default/xui/es/floater_live_lsleditor.xml | 10 +- .../skins/default/xui/es/floater_moveview.xml | 30 +- .../newview/skins/default/xui/es/floater_mute.xml | 24 +- .../default/xui/es/floater_name_description.xml | 22 +- .../skins/default/xui/es/floater_new_im.xml | 22 +- .../default/xui/es/floater_new_outfit_dialog.xml | 178 +- .../skins/default/xui/es/floater_openobject.xml | 20 +- .../newview/skins/default/xui/es/floater_pay.xml | 42 +- .../skins/default/xui/es/floater_pay_object.xml | 60 +- .../skins/default/xui/es/floater_postcard.xml | 56 +- .../skins/default/xui/es/floater_preferences.xml | 14 +- .../default/xui/es/floater_preview_animation.xml | 20 +- .../xui/es/floater_preview_embedded_texture.xml | 14 +- .../xui/es/floater_preview_existing_landmark.xml | 16 +- .../default/xui/es/floater_preview_gesture.xml | 96 +- .../default/xui/es/floater_preview_notecard.xml | 20 +- .../es/floater_preview_notecard_keep_discard.xml | 22 +- .../skins/default/xui/es/floater_preview_sound.xml | 24 +- .../default/xui/es/floater_preview_texture.xml | 18 +- .../es/floater_preview_texture_keep_discard.xml | 22 +- .../default/xui/es/floater_price_for_listing.xml | 34 +- .../skins/default/xui/es/floater_profile.xml | 4 +- .../skins/default/xui/es/floater_report_abuse.xml | 156 +- .../skins/default/xui/es/floater_report_bug.xml | 210 +- .../skins/default/xui/es/floater_script_debug.xml | 12 +- .../default/xui/es/floater_script_ed_panel.xml | 58 +- .../default/xui/es/floater_script_preview.xml | 12 +- .../skins/default/xui/es/floater_script_queue.xml | 8 +- .../skins/default/xui/es/floater_script_search.xml | 26 +- .../skins/default/xui/es/floater_sell_land.xml | 136 +- .../default/xui/es/floater_settings_debug.xml | 32 +- .../skins/default/xui/es/floater_snapshot.xml | 224 +- .../skins/default/xui/es/floater_sound_preview.xml | 56 +- .../skins/default/xui/es/floater_telehub.xml | 56 +- .../skins/default/xui/es/floater_texture_ctrl.xml | 34 +- .../newview/skins/default/xui/es/floater_tools.xml | 1098 +-- .../skins/default/xui/es/floater_top_objects.xml | 100 +- .../newview/skins/default/xui/es/floater_tos.xml | 52 +- .../default/xui/es/floater_wearable_save_as.xml | 22 +- .../skins/default/xui/es/floater_world_map.xml | 178 +- .../skins/default/xui/es/menu_inventory.xml | 132 +- .../skins/default/xui/es/menu_pie_attachment.xml | 12 +- .../skins/default/xui/es/menu_pie_avatar.xml | 30 +- .../newview/skins/default/xui/es/menu_pie_land.xml | 20 +- .../skins/default/xui/es/menu_pie_object.xml | 46 +- .../newview/skins/default/xui/es/menu_pie_self.xml | 58 +- .../newview/skins/default/xui/es/menu_viewer.xml | 430 +- .../indra/newview/skins/default/xui/es/notify.xml | 1654 ++-- .../newview/skins/default/xui/es/panel_avatar.xml | 388 +- .../default/xui/es/panel_avatar_classified.xml | 50 +- .../skins/default/xui/es/panel_avatar_pick.xml | 20 +- .../skins/default/xui/es/panel_chat_bar.xml | 28 +- .../skins/default/xui/es/panel_classified.xml | 28 +- .../newview/skins/default/xui/es/panel_event.xml | 116 +- .../newview/skins/default/xui/es/panel_group.xml | 28 +- .../skins/default/xui/es/panel_group_finder.xml | 18 +- .../skins/default/xui/es/panel_group_general.xml | 154 +- .../skins/default/xui/es/panel_group_invite.xml | 40 +- .../default/xui/es/panel_group_land_money.xml | 172 +- .../skins/default/xui/es/panel_group_notices.xml | 148 +- .../skins/default/xui/es/panel_group_roles.xml | 322 +- .../skins/default/xui/es/panel_group_voting.xml | 162 +- .../skins/default/xui/es/panel_land_covenant.xml | 78 +- .../newview/skins/default/xui/es/panel_login.xml | 74 +- .../skins/default/xui/es/panel_media_remote.xml | 26 +- .../skins/default/xui/es/panel_overlaybar.xml | 28 +- .../newview/skins/default/xui/es/panel_place.xml | 12 +- .../skins/default/xui/es/panel_place_small.xml | 12 +- .../default/xui/es/panel_preferences_audio.xml | 110 +- .../default/xui/es/panel_preferences_chat.xml | 112 +- .../default/xui/es/panel_preferences_general.xml | 180 +- .../default/xui/es/panel_preferences_graphics1.xml | 86 +- .../skins/default/xui/es/panel_preferences_im.xml | 46 +- .../default/xui/es/panel_preferences_input.xml | 52 +- .../default/xui/es/panel_preferences_network.xml | 54 +- .../default/xui/es/panel_preferences_popups.xml | 28 +- .../skins/default/xui/es/panel_region_covenant.xml | 104 +- .../skins/default/xui/es/panel_region_debug.xml | 72 +- .../skins/default/xui/es/panel_region_estate.xml | 120 +- .../skins/default/xui/es/panel_region_general.xml | 84 +- .../skins/default/xui/es/panel_region_terrain.xml | 60 +- .../skins/default/xui/es/panel_region_texture.xml | 114 +- .../skins/default/xui/es/panel_scrolling_param.xml | 24 +- .../skins/default/xui/es/panel_status_bar.xml | 64 +- .../newview/skins/default/xui/es/panel_toolbar.xml | 42 +- .../skins/default/xui/es/panel_top_pick.xml | 20 +- .../newview/skins/default/xui/es/xui_version.xml | 8 +- .../indra/newview/skins/default/xui/fr/alerts.xml | 9398 ++++++++++---------- .../newview/skins/default/xui/fr/floater_about.xml | 68 +- .../default/xui/fr/floater_active_speakers.xml | 22 +- .../default/xui/fr/floater_animation_preview.xml | 344 +- .../skins/default/xui/fr/floater_auction.xml | 36 +- .../skins/default/xui/fr/floater_audio_volume.xml | 8 +- .../skins/default/xui/fr/floater_avatar_picker.xml | 42 +- .../default/xui/fr/floater_avatar_textures.xml | 76 +- .../skins/default/xui/fr/floater_build_options.xml | 16 +- .../newview/skins/default/xui/fr/floater_bumps.xml | 42 +- .../skins/default/xui/fr/floater_buy_contents.xml | 42 +- .../skins/default/xui/fr/floater_buy_currency.xml | 136 +- .../skins/default/xui/fr/floater_buy_land.xml | 470 +- .../skins/default/xui/fr/floater_buy_object.xml | 52 +- .../skins/default/xui/fr/floater_camera.xml | 24 +- .../skins/default/xui/fr/floater_chat_history.xml | 100 +- .../skins/default/xui/fr/floater_chatterbox.xml | 4 +- .../skins/default/xui/fr/floater_choose_group.xml | 16 +- .../skins/default/xui/fr/floater_clothing.xml | 18 +- .../skins/default/xui/fr/floater_color_picker.xml | 64 +- .../skins/default/xui/fr/floater_critical.xml | 22 +- .../skins/default/xui/fr/floater_customize.xml | 1050 +-- .../default/xui/fr/floater_day_cycle_options.xml | 194 +- .../default/xui/fr/floater_device_settings.xml | 6 +- .../skins/default/xui/fr/floater_directory.xml | 758 +- .../skins/default/xui/fr/floater_env_settings.xml | 54 +- .../skins/default/xui/fr/floater_gesture.xml | 36 +- .../skins/default/xui/fr/floater_god_tools.xml | 304 +- .../skins/default/xui/fr/floater_group_info.xml | 566 +- .../default/xui/fr/floater_hardware_settings.xml | 80 +- .../newview/skins/default/xui/fr/floater_hud.xml | 4 +- .../newview/skins/default/xui/fr/floater_im.xml | 90 +- .../skins/default/xui/fr/floater_image_preview.xml | 104 +- .../skins/default/xui/fr/floater_import.xml | 34 +- .../skins/default/xui/fr/floater_inspect.xml | 28 +- .../default/xui/fr/floater_instant_message.xml | 98 +- .../xui/fr/floater_instant_message_ad_hoc.xml | 86 +- .../xui/fr/floater_instant_message_group.xml | 100 +- .../skins/default/xui/fr/floater_inventory.xml | 110 +- .../xui/fr/floater_inventory_item_properties.xml | 172 +- .../xui/fr/floater_inventory_view_finder.xml | 48 +- .../skins/default/xui/fr/floater_joystick.xml | 166 +- .../skins/default/xui/fr/floater_lagmeter.xml | 304 +- .../skins/default/xui/fr/floater_land_holdings.xml | 82 +- .../skins/default/xui/fr/floater_landmark_ctrl.xml | 20 +- .../default/xui/fr/floater_live_lsleditor.xml | 24 +- .../skins/default/xui/fr/floater_lsl_guide.xml | 14 +- .../skins/default/xui/fr/floater_media_browser.xml | 40 +- .../skins/default/xui/fr/floater_mem_leaking.xml | 36 +- .../skins/default/xui/fr/floater_moveview.xml | 30 +- .../newview/skins/default/xui/fr/floater_mute.xml | 24 +- .../skins/default/xui/fr/floater_mute_object.xml | 24 +- .../skins/default/xui/fr/floater_my_friends.xml | 14 +- .../default/xui/fr/floater_name_description.xml | 22 +- .../skins/default/xui/fr/floater_new_im.xml | 22 +- .../default/xui/fr/floater_new_outfit_dialog.xml | 178 +- .../skins/default/xui/fr/floater_openobject.xml | 22 +- .../newview/skins/default/xui/fr/floater_pay.xml | 44 +- .../skins/default/xui/fr/floater_pay_object.xml | 60 +- .../skins/default/xui/fr/floater_post_process.xml | 108 +- .../skins/default/xui/fr/floater_postcard.xml | 90 +- .../skins/default/xui/fr/floater_preferences.xml | 16 +- .../default/xui/fr/floater_preview_animation.xml | 20 +- .../default/xui/fr/floater_preview_classified.xml | 4 +- .../xui/fr/floater_preview_embedded_texture.xml | 16 +- .../skins/default/xui/fr/floater_preview_event.xml | 4 +- .../xui/fr/floater_preview_existing_landmark.xml | 18 +- .../default/xui/fr/floater_preview_gesture.xml | 130 +- .../default/xui/fr/floater_preview_notecard.xml | 32 +- .../fr/floater_preview_notecard_keep_discard.xml | 34 +- .../skins/default/xui/fr/floater_preview_sound.xml | 24 +- .../default/xui/fr/floater_preview_texture.xml | 18 +- .../fr/floater_preview_texture_keep_discard.xml | 22 +- .../skins/default/xui/fr/floater_preview_url.xml | 4 +- .../default/xui/fr/floater_price_for_listing.xml | 28 +- .../skins/default/xui/fr/floater_profile.xml | 4 +- .../skins/default/xui/fr/floater_region_info.xml | 4 +- .../skins/default/xui/fr/floater_report_abuse.xml | 376 +- .../skins/default/xui/fr/floater_report_bug.xml | 220 +- .../skins/default/xui/fr/floater_script_debug.xml | 12 +- .../default/xui/fr/floater_script_ed_panel.xml | 86 +- .../default/xui/fr/floater_script_preview.xml | 12 +- .../skins/default/xui/fr/floater_script_queue.xml | 8 +- .../skins/default/xui/fr/floater_script_search.xml | 26 +- .../skins/default/xui/fr/floater_select_key.xml | 14 +- .../skins/default/xui/fr/floater_sell_land.xml | 136 +- .../default/xui/fr/floater_settings_debug.xml | 34 +- .../default/xui/fr/floater_sim_release_message.xml | 32 +- .../xui/fr/floater_skin_preview_template.xml | 74 +- .../skins/default/xui/fr/floater_snapshot.xml | 282 +- .../skins/default/xui/fr/floater_sound_preview.xml | 56 +- .../skins/default/xui/fr/floater_telehub.xml | 56 +- .../newview/skins/default/xui/fr/floater_test.xml | 4 +- .../skins/default/xui/fr/floater_texture_ctrl.xml | 48 +- .../newview/skins/default/xui/fr/floater_tools.xml | 1302 +-- .../skins/default/xui/fr/floater_top_objects.xml | 102 +- .../newview/skins/default/xui/fr/floater_tos.xml | 54 +- .../skins/default/xui/fr/floater_url_entry.xml | 24 +- .../skins/default/xui/fr/floater_voice_wizard.xml | 18 +- .../newview/skins/default/xui/fr/floater_water.xml | 178 +- .../default/xui/fr/floater_wearable_save_as.xml | 22 +- .../default/xui/fr/floater_windlight_options.xml | 380 +- .../skins/default/xui/fr/floater_world_map.xml | 214 +- .../skins/default/xui/fr/menu_inventory.xml | 140 +- .../newview/skins/default/xui/fr/menu_login.xml | 26 +- .../skins/default/xui/fr/menu_pie_attachment.xml | 12 +- .../skins/default/xui/fr/menu_pie_avatar.xml | 34 +- .../newview/skins/default/xui/fr/menu_pie_land.xml | 20 +- .../skins/default/xui/fr/menu_pie_object.xml | 48 +- .../newview/skins/default/xui/fr/menu_pie_self.xml | 58 +- .../newview/skins/default/xui/fr/menu_slurl.xml | 12 +- .../newview/skins/default/xui/fr/menu_viewer.xml | 558 +- .../newview/skins/default/xui/fr/mime_types.xml | 460 +- .../indra/newview/skins/default/xui/fr/notify.xml | 2130 ++--- .../newview/skins/default/xui/fr/panel_audio.xml | 20 +- .../skins/default/xui/fr/panel_audio_device.xml | 52 +- .../newview/skins/default/xui/fr/panel_avatar.xml | 424 +- .../default/xui/fr/panel_avatar_classified.xml | 82 +- .../skins/default/xui/fr/panel_avatar_pick.xml | 20 +- .../skins/default/xui/fr/panel_chat_bar.xml | 36 +- .../skins/default/xui/fr/panel_classified.xml | 66 +- .../newview/skins/default/xui/fr/panel_event.xml | 146 +- .../newview/skins/default/xui/fr/panel_friends.xml | 58 +- .../newview/skins/default/xui/fr/panel_group.xml | 26 +- .../skins/default/xui/fr/panel_group_finder.xml | 18 +- .../skins/default/xui/fr/panel_group_general.xml | 206 +- .../skins/default/xui/fr/panel_group_invite.xml | 68 +- .../default/xui/fr/panel_group_land_money.xml | 176 +- .../skins/default/xui/fr/panel_group_notices.xml | 158 +- .../skins/default/xui/fr/panel_group_roles.xml | 332 +- .../skins/default/xui/fr/panel_group_voting.xml | 238 +- .../newview/skins/default/xui/fr/panel_groups.xml | 36 +- .../skins/default/xui/fr/panel_land_covenant.xml | 78 +- .../newview/skins/default/xui/fr/panel_login.xml | 108 +- .../skins/default/xui/fr/panel_master_volume.xml | 12 +- .../skins/default/xui/fr/panel_media_controls.xml | 76 +- .../skins/default/xui/fr/panel_media_remote.xml | 20 +- .../default/xui/fr/panel_media_remote_expanded.xml | 56 +- .../skins/default/xui/fr/panel_overlaybar.xml | 40 +- .../newview/skins/default/xui/fr/panel_place.xml | 82 +- .../skins/default/xui/fr/panel_place_small.xml | 82 +- .../default/xui/fr/panel_preferences_audio.xml | 58 +- .../default/xui/fr/panel_preferences_chat.xml | 132 +- .../default/xui/fr/panel_preferences_general.xml | 262 +- .../default/xui/fr/panel_preferences_graphics1.xml | 394 +- .../skins/default/xui/fr/panel_preferences_im.xml | 76 +- .../default/xui/fr/panel_preferences_input.xml | 88 +- .../default/xui/fr/panel_preferences_network.xml | 48 +- .../default/xui/fr/panel_preferences_popups.xml | 58 +- .../default/xui/fr/panel_preferences_skins.xml | 28 +- .../default/xui/fr/panel_preferences_voice.xml | 74 +- .../skins/default/xui/fr/panel_preferences_web.xml | 62 +- .../skins/default/xui/fr/panel_region_covenant.xml | 100 +- .../skins/default/xui/fr/panel_region_debug.xml | 102 +- .../skins/default/xui/fr/panel_region_estate.xml | 156 +- .../skins/default/xui/fr/panel_region_general.xml | 106 +- .../skins/default/xui/fr/panel_region_terrain.xml | 60 +- .../skins/default/xui/fr/panel_region_texture.xml | 144 +- .../skins/default/xui/fr/panel_scrolling_param.xml | 24 +- .../default/xui/fr/panel_speaker_controls.xml | 82 +- .../skins/default/xui/fr/panel_status_bar.xml | 86 +- .../newview/skins/default/xui/fr/panel_toolbar.xml | 44 +- .../skins/default/xui/fr/panel_top_pick.xml | 20 +- .../skins/default/xui/fr/panel_voice_controls.xml | 16 +- .../skins/default/xui/fr/panel_voice_enable.xml | 46 +- .../skins/default/xui/fr/panel_voice_options.xml | 46 +- .../default/xui/fr/panel_voice_remote_expanded.xml | 8 +- .../newview/skins/default/xui/fr/role_actions.xml | 402 +- .../indra/newview/skins/default/xui/fr/strings.xml | 834 +- .../skins/default/xui/fr/teleport_strings.xml | 180 +- .../newview/skins/default/xui/fr/xui_version.xml | 8 +- .../newview/skins/default/xui/ja/LCD_text.xml | 150 +- .../default/xui/ja/floater_active_speakers.xml | 24 +- .../skins/default/xui/ja/floater_audio_volume.xml | 8 +- .../skins/default/xui/ja/floater_camera.xml | 24 +- .../skins/default/xui/ja/floater_chatterbox.xml | 4 +- .../default/xui/ja/floater_day_cycle_options.xml | 194 +- .../default/xui/ja/floater_device_settings.xml | 2 +- .../skins/default/xui/ja/floater_env_settings.xml | 48 +- .../default/xui/ja/floater_hardware_settings.xml | 84 +- .../newview/skins/default/xui/ja/floater_hud.xml | 4 +- .../skins/default/xui/ja/floater_inspect.xml | 28 +- .../xui/ja/floater_instant_message_ad_hoc.xml | 114 +- .../xui/ja/floater_instant_message_group.xml | 158 +- .../skins/default/xui/ja/floater_joystick.xml | 254 +- .../skins/default/xui/ja/floater_lagmeter.xml | 304 +- .../skins/default/xui/ja/floater_landmark_ctrl.xml | 24 +- .../skins/default/xui/ja/floater_lsl_guide.xml | 14 +- .../skins/default/xui/ja/floater_media_browser.xml | 38 +- .../skins/default/xui/ja/floater_mem_leaking.xml | 38 +- .../skins/default/xui/ja/floater_mute_object.xml | 24 +- .../skins/default/xui/ja/floater_my_friends.xml | 14 +- .../skins/default/xui/ja/floater_post_process.xml | 108 +- .../default/xui/ja/floater_preview_classified.xml | 4 +- .../skins/default/xui/ja/floater_preview_event.xml | 4 +- .../skins/default/xui/ja/floater_preview_url.xml | 4 +- .../skins/default/xui/ja/floater_region_info.xml | 4 +- .../skins/default/xui/ja/floater_select_key.xml | 14 +- .../default/xui/ja/floater_sim_release_message.xml | 32 +- .../xui/ja/floater_skin_preview_template.xml | 70 +- .../newview/skins/default/xui/ja/floater_test.xml | 4 +- .../skins/default/xui/ja/floater_url_entry.xml | 26 +- .../skins/default/xui/ja/floater_voice_wizard.xml | 18 +- .../newview/skins/default/xui/ja/floater_water.xml | 178 +- .../default/xui/ja/floater_windlight_options.xml | 380 +- .../newview/skins/default/xui/ja/menu_login.xml | 26 +- .../newview/skins/default/xui/ja/menu_slurl.xml | 12 +- .../newview/skins/default/xui/ja/mime_types.xml | 460 +- .../newview/skins/default/xui/ja/need_to_long.xml | 482 +- .../skins/default/xui/ja/need_to_translate.xml | 3102 +++---- .../skins/default/xui/ja/need_to_update.xml | 1518 ++-- .../newview/skins/default/xui/ja/panel_audio.xml | 22 +- .../skins/default/xui/ja/panel_audio_device.xml | 52 +- .../newview/skins/default/xui/ja/panel_friends.xml | 106 +- .../newview/skins/default/xui/ja/panel_groups.xml | 32 +- .../skins/default/xui/ja/panel_master_volume.xml | 14 +- .../skins/default/xui/ja/panel_media_controls.xml | 90 +- .../default/xui/ja/panel_media_remote_expanded.xml | 56 +- .../skins/default/xui/ja/panel_preferences_LCD.xml | 66 +- .../default/xui/ja/panel_preferences_skins.xml | 28 +- .../default/xui/ja/panel_preferences_voice.xml | 82 +- .../skins/default/xui/ja/panel_preferences_web.xml | 66 +- .../default/xui/ja/panel_speaker_controls.xml | 84 +- .../skins/default/xui/ja/panel_voice_controls.xml | 20 +- .../skins/default/xui/ja/panel_voice_enable.xml | 46 +- .../skins/default/xui/ja/panel_voice_options.xml | 52 +- .../skins/default/xui/ja/panel_voice_remote.xml | 16 +- .../default/xui/ja/panel_voice_remote_expanded.xml | 8 +- .../indra/newview/skins/default/xui/ja/strings.xml | 886 +- .../skins/default/xui/ja/teleport_strings.xml | 174 +- .../newview/skins/default/xui/ko/LCD_text.xml | 150 +- .../default/xui/ko/floater_active_speakers.xml | 22 +- .../skins/default/xui/ko/floater_audio_volume.xml | 8 +- .../skins/default/xui/ko/floater_camera.xml | 24 +- .../skins/default/xui/ko/floater_chatterbox.xml | 4 +- .../default/xui/ko/floater_day_cycle_options.xml | 194 +- .../default/xui/ko/floater_device_settings.xml | 4 +- .../skins/default/xui/ko/floater_env_settings.xml | 48 +- .../default/xui/ko/floater_hardware_settings.xml | 80 +- .../newview/skins/default/xui/ko/floater_hud.xml | 4 +- .../skins/default/xui/ko/floater_inspect.xml | 28 +- .../xui/ko/floater_instant_message_ad_hoc.xml | 114 +- .../xui/ko/floater_instant_message_group.xml | 158 +- .../skins/default/xui/ko/floater_joystick.xml | 166 +- .../skins/default/xui/ko/floater_lagmeter.xml | 304 +- .../skins/default/xui/ko/floater_landmark_ctrl.xml | 20 +- .../skins/default/xui/ko/floater_lsl_guide.xml | 14 +- .../skins/default/xui/ko/floater_media_browser.xml | 38 +- .../skins/default/xui/ko/floater_mem_leaking.xml | 36 +- .../skins/default/xui/ko/floater_mute_object.xml | 24 +- .../skins/default/xui/ko/floater_my_friends.xml | 14 +- .../skins/default/xui/ko/floater_post_process.xml | 106 +- .../default/xui/ko/floater_preview_classified.xml | 4 +- .../skins/default/xui/ko/floater_preview_event.xml | 4 +- .../skins/default/xui/ko/floater_preview_url.xml | 4 +- .../skins/default/xui/ko/floater_region_info.xml | 4 +- .../skins/default/xui/ko/floater_select_key.xml | 14 +- .../default/xui/ko/floater_sim_release_message.xml | 32 +- .../xui/ko/floater_skin_preview_template.xml | 70 +- .../newview/skins/default/xui/ko/floater_test.xml | 4 +- .../skins/default/xui/ko/floater_url_entry.xml | 26 +- .../skins/default/xui/ko/floater_voice_wizard.xml | 18 +- .../newview/skins/default/xui/ko/floater_water.xml | 178 +- .../default/xui/ko/floater_windlight_options.xml | 380 +- .../newview/skins/default/xui/ko/menu_login.xml | 26 +- .../newview/skins/default/xui/ko/menu_slurl.xml | 12 +- .../newview/skins/default/xui/ko/mime_types.xml | 460 +- .../newview/skins/default/xui/ko/need_to_long.xml | 356 +- .../skins/default/xui/ko/need_to_translate.xml | 2464 ++--- .../skins/default/xui/ko/need_to_update.xml | 1242 +-- .../newview/skins/default/xui/ko/panel_audio.xml | 22 +- .../skins/default/xui/ko/panel_audio_device.xml | 52 +- .../newview/skins/default/xui/ko/panel_friends.xml | 98 +- .../newview/skins/default/xui/ko/panel_groups.xml | 32 +- .../skins/default/xui/ko/panel_master_volume.xml | 14 +- .../skins/default/xui/ko/panel_media_controls.xml | 76 +- .../default/xui/ko/panel_media_remote_expanded.xml | 56 +- .../skins/default/xui/ko/panel_preferences_LCD.xml | 62 +- .../default/xui/ko/panel_preferences_skins.xml | 28 +- 482 files changed, 40025 insertions(+), 40025 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/skins/default/xui/de/LCD_text.xml b/linden/indra/newview/skins/default/xui/de/LCD_text.xml index a20d9f4..5e63b02 100644 --- a/linden/indra/newview/skins/default/xui/de/LCD_text.xml +++ b/linden/indra/newview/skins/default/xui/de/LCD_text.xml @@ -1,75 +1,75 @@ - - - - Debug-Info - - - FPS - - - SimFPS - - - P-Ein - - - P-Aus - - - P-Verlust - - - Ping - - - Kontodaten - - - L$-Stand - - - Zeit - - - Standortdetails 1 - - - Standortdetails 2 - - - Region - - - Parzelle - - - Pos - - - qm - - - Eigentümer - - - Typ - - - Ja - - - Nein - - - Zum Verkauf - - - Traffic - - - Letzte 3 Chat-Zeilen - - - Letzte 3 IM-Zeilen - - + + + + Debug-Info + + + FPS + + + SimFPS + + + P-Ein + + + P-Aus + + + P-Verlust + + + Ping + + + Kontodaten + + + L$-Stand + + + Zeit + + + Standortdetails 1 + + + Standortdetails 2 + + + Region + + + Parzelle + + + Pos + + + qm + + + Eigentümer + + + Typ + + + Ja + + + Nein + + + Zum Verkauf + + + Traffic + + + Letzte 3 Chat-Zeilen + + + Letzte 3 IM-Zeilen + + diff --git a/linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml index 9ec58c1..372a7af 100644 --- a/linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml +++ b/linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml @@ -1,13 +1,13 @@ - - - - - - - - -