FIRE-3254, FIRE-3267, Initial Branding of Linux system install, don't register w/desktop by default.

indra/newview/linux_tools/FIRESTORM_DESKTOPINSTALL.txt

@@ -0,0 +1,3 @@
+If you wish to install Firestorm on your desktop menus, we no longer do this by default. Instead, run:
+
+./etc/refresh_desktop_app_entry.sh

indra/newview/linux_tools/handle_secondlifeprotocol.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Send a URL of the form secondlife://... to Second Life.
+# Send a URL of the form secondlife://... to the viewer.
 #
 
 URL="$1"
@@ -13,5 +13,5 @@ fi
 RUN_PATH=`dirname "$0" || echo .`
 cd "${RUN_PATH}/.."
 
-exec ./secondlife -url \'"${URL}"\'
+exec ./firestorm -url \'"${URL}"\'
 

indra/newview/linux_tools/install.sh

@@ -48,8 +48,8 @@ function warn()
 function homedir_install()
 {
     warn "You are not running as a privileged user, so you will only be able"
-    warn "to install the Second Life Viewer in your home directory. If you"
-    warn "would like to install the Second Life Viewer system-wide, please run"
+    warn "to install the Firestorm Viewer in your home directory. If you"
+    warn "would like to install the Firestorm Viewer system-wide, please run"
     warn "this script as the root user, or with the 'sudo' command."
     echo
 
@@ -58,13 +58,13 @@ function homedir_install()
 	exit 0
     fi
 
-    install_to_prefix "$HOME/.secondlife-install"
-    $HOME/.secondlife-install/etc/refresh_desktop_app_entry.sh
+    install_to_prefix "$HOME/firestorm"
+    $HOME/firestorm/etc/refresh_desktop_app_entry.sh
 }
 
 function root_install()
 {
-    local default_prefix="/opt/secondlife-install"
+    local default_prefix="/opt/firestorm-install"
 
     echo -n "Enter the desired installation directory [${default_prefix}]: ";
     read

indra/newview/linux_tools/refresh_desktop_app_entry.sh

@@ -13,12 +13,12 @@ function install_desktop_entry()
     local desktop_entry="\
 [Desktop Entry]\n\
 Name=Firestorm Viewer\n\
-Comment=Client for the On-line Virtual World, Second Life\n\
+Comment=Client for the MetaVerse\n\
 Exec=${installation_prefix}/firestorm\n\
-Icon=${installation_prefix}/secondlife_icon.png\n\
+Icon=${installation_prefix}/firestorm_icon.png\n\
 Terminal=false\n\
 Type=Application\n\
-Categories=Application;Network;\n\
+Categories=Application;Internet;Network;\n\
 StartupNotify=true\n\
 X-Desktop-File-Install-Version=3.0"
 

indra/newview/linux_tools/wrapper.sh

@@ -86,7 +86,8 @@ cd "${RUN_PATH}"
 ./etc/register_secondlifeprotocol.sh
 
 # Re-register the application with the desktop system every launch, for now.
-./etc/refresh_desktop_app_entry.sh
+# AO: Disabled don't install by default
+#./etc/refresh_desktop_app_entry.sh
 
 ## Before we mess with LD_LIBRARY_PATH, save the old one to restore for
 ##  subprocesses that care.
@@ -128,7 +129,7 @@ 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 Firestorm Viewer on a x86_64 platform.  The
 most common problems when launching the Viewer (particularly
 'bin/do-not-directly-run-firestorm-bin: not found' and 'error while
 loading shared libraries') may be solved by installing your Linux
@@ -141,9 +142,3 @@ EOFMARKER
 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

indra/newview/viewer_manifest.py

@@ -965,9 +965,10 @@ class LinuxManifest(ViewerManifest):
         super(LinuxManifest, self).construct()
         self.path("licenses-linux.txt","licenses.txt")
         self.path("VivoxAUP.txt")
-        self.path("res/firestorm_icon.png","secondlife_icon.png")
+        self.path("res/firestorm_icon.png","firestorm_icon.png")
         if self.prefix("linux_tools", dst=""):
             self.path("client-readme.txt","README-linux.txt")
+	    self.path("FIRESTORM_DESKTOPINSTALL.txt","FIRESTORM_DESKTOPINSTALL.txt")
             self.path("client-readme-voice.txt","README-linux-voice.txt")
             self.path("client-readme-joystick.txt","README-linux-joystick.txt")
             self.path("wrapper.sh","firestorm")