From d9efc718418e6b16cd390aaaeea9cc82cdf151c4 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 14 Oct 2008 20:04:32 -0500 Subject: Rebranded Linux-specific installer/support files. Replaced instances of "Second Life" with "Imprudence", etc. --- linden/indra/cmake/UnixInstall.cmake | 4 ++-- linden/indra/linux_crash_logger/llcrashloggerlinux.cpp | 6 +++--- .../indra/newview/linux_tools/handle_secondlifeprotocol.sh | 2 +- linden/indra/newview/linux_tools/wrapper.sh | 14 +++----------- 4 files changed, 9 insertions(+), 17 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake index 139be0a..0234dee 100644 --- a/linden/indra/cmake/UnixInstall.cmake +++ b/linden/indra/cmake/UnixInstall.cmake @@ -21,11 +21,11 @@ if (INSTALL) set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH "Installation directory for read-only shared files.") - set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/secondlife-${viewer_VERSION} + set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/imprudence-${viewer_VERSION} CACHE PATH "Installation directory for binaries.") - set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/secondlife-${viewer_VERSION} + set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/imprudence-${viewer_VERSION} CACHE PATH "Installation directory for read-only data files.") endif (INSTALL) diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp index aa2b82c..6ac9831 100644 --- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -53,13 +53,13 @@ // These need to be localized. static const char dialog_text[] = -"Second Life appears to have crashed or frozen last time it ran.\n" -"This crash reporter collects information about your computer's hardware, operating system, and some Second Life logs, all of which are used for debugging purposes only.\n" +"Imprudence appears to have crashed or frozen last time it ran.\n" +"This crash reporter collects information about your computer's hardware, operating system, and some Imprudence logs, all of which are used for debugging purposes only.\n" "\n" "Send crash report?"; static const char dialog_title[] = -"Second Life Crash Logger"; +"Imprudence Crash Logger"; #if LL_GTK static void response_callback (GtkDialog *dialog, diff --git a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh index 7ff86d1..3613070 100755 --- a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh +++ b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh @@ -13,5 +13,5 @@ fi RUN_PATH=`dirname "$0" || echo .` cd "${RUN_PATH}" -exec ./secondlife -url \'"${URL}"\' +exec ./imprudence -url \'"${URL}"\' diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh index 9d2e06b..e1c68b9 100755 --- a/linden/indra/newview/linux_tools/wrapper.sh +++ b/linden/indra/newview/linux_tools/wrapper.sh @@ -103,7 +103,7 @@ if [ -n "$LL_TCMALLOC" ]; then fi export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' -export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin' +export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin' export SL_OPT="`cat gridargs.dat` $@" # Run the program @@ -118,9 +118,9 @@ if [ -n "$LL_RUN_ERR" ]; then if [ "`uname -m`" = "x86_64" ]; then echo cat << EOFMARKER -You are running the Second Life Viewer on a x86_64 platform. The +You are running the Imprudence Viewer on a x86_64 platform. The most common problems when launching the Viewer (particularly -'bin/do-not-directly-run-secondlife-bin: not found' and 'error while +'bin/do-not-directly-run-imprudence-bin: not found' and 'error while loading shared libraries') may be solved by installing your Linux distribution's 32-bit compatibility packages. For example, on Ubuntu and other Debian-based Linuxes you might run: @@ -129,11 +129,3 @@ EOFMARKER fi fi fi - - -echo -echo '*******************************************************' -echo 'This is a BETA release of the Second Life linux client.' -echo 'Thank you for testing!' -echo 'Please see README-linux.txt before reporting problems.' -echo -- cgit v1.1