merge changes for vmrg-178

9 files changed, 158 insertions, 42 deletions

diff --git a/BuildParams b/BuildParams
index 1c76b6f935..5068edb21f 100644..100755
--- a/BuildParams
+++ b/BuildParams
@@ -190,4 +190,10 @@ simon_viewer-dev-private.public_build = false
 simon_viewer-dev-private.email_status_this_is_os = false
 
 
+# ========================================
+# Vir
+# ========================================
+vir-project-1.viewer_channel = "Second Life Release"
+vir-project-1.login_channel = "Second Life Release"
+
 # eof
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5c0ea2f774..5c0ea2f774 100644..100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
diff --git a/indra/newview/installers/darwin/dmg-cleanup.applescript b/indra/newview/installers/darwin/dmg-cleanup.applescript
index f3d39aec21..8a71b392f9 100644
--- a/indra/newview/installers/darwin/dmg-cleanup.applescript
+++ b/indra/newview/installers/darwin/dmg-cleanup.applescript
@@ -19,7 +19,7 @@ tell application "Finder"
 	set current view of foo to icon view
 	set toolbar visible of foo to false
 	set statusbar visible of foo to false
-	set the bounds of foo to {100, 100, 600, 399}
+	set the bounds of foo to {100, 100, 600, 449}
 	
 	-- set the position of front window to {100, 100}
 	-- get {name, position} of every item of front window
diff --git a/indra/newview/installers/darwin/fix_application_icon_position.sh b/indra/newview/installers/darwin/fix_application_icon_position.sh
index c6b92589db..618e34820c 100644..100755
--- a/indra/newview/installers/darwin/fix_application_icon_position.sh
+++ b/indra/newview/installers/darwin/fix_application_icon_position.sh
@@ -1,6 +1,6 @@
 # just run this script each time after you change the installer's name to fix the icon misalignment 
 #!/bin/bash
-cp -r ./../../../build-darwin-i386/newview/*.dmg ~/Desktop/TempBuild.dmg
+cp -r ../../../../build-darwin-i386/newview/*.dmg ~/Desktop/TempBuild.dmg
 hdid ~/Desktop/TempBuild.dmg
 open -a finder /Volumes/Second\ Life\ Installer
 osascript dmg-cleanup.applescript
diff --git a/indra/newview/installers/darwin/release-dmg/_DS_Store b/indra/newview/installers/darwin/release-dmg/_DS_Store
index 8f6c25c2f4..747ca961d8 100644
--- a/indra/newview/installers/darwin/release-dmg/_DS_Store
+++ b/indra/newview/installers/darwin/release-dmg/_DS_Store
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 4811f1fcd5..02ca7cbb3a 100644..100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -1,6 +1,22 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; secondlife setup.nsi

-;; Copyright 2004-2010, Linden Research, Inc.

+;; Copyright 2004-2011, Linden Research, Inc.

+;;

+;; This library is free software; you can redistribute it and/or

+;; modify it under the terms of the GNU Lesser General Public

+;; License as published by the Free Software Foundation;

+;; version 2.1 of the License only.

+;;

+;; This library is distributed in the hope that it will be useful,

+;; but WITHOUT ANY WARRANTY; without even the implied warranty of

+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+;; Lesser General Public License for more details.

+;;

+;; You should have received a copy of the GNU Lesser General Public

+;; License along with this library; if not, write to the Free Software

+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+;;

+;; Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

 ;;

 ;; NSIS Unicode 2.38.1 or higher required

 ;; http://www.scratchpaper.com/

@@ -293,19 +309,106 @@ Function CheckNetworkConnection
     Return

 FunctionEnd

 

+

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Delete files in Documents and Settings\<user>\SecondLife\cache

-; Delete files in Documents and Settings\All Users\SecondLife\cache

+; Save user files to temp location

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;Function RemoveCacheFiles

-;

-;; Delete files in Documents and Settings\<user>\SecondLife

+Function PreserveUserFiles

+

+Push $0

+Push $1

+Push $2

+

+    RMDir /r "$TEMP\SecondLifeSettingsBackup"

+    CreateDirectory "$TEMP\SecondLifeSettingsBackup"

+    StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+

+  LOOP:

+    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+    StrCmp $1 "" DONE               ; no more users

+

+    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+

+    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+    ExpandEnvStrings $2 $2

+

+    CreateDirectory "$TEMP\SecondLifeSettingsBackup\$0"

+    CopyFiles  "$2\Application Data\SecondLife\*" "$TEMP\SecondLifeSettingsBackup\$0"

+

+  CONTINUE:

+    IntOp $0 $0 + 1

+    Goto LOOP

+  DONE:

+

+Pop $2

+Pop $1

+Pop $0

+

+; Copy files in Documents and Settings\All Users\SecondLife

+Push $0

+    ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+    StrCmp $0 "" +2

+    CreateDirectory "$TEMP\SecondLifeSettingsBackup\AllUsers\"

+    CopyFiles "$2\Application Data\SecondLife\*" "$TEMP\SecondLifeSettingsBackup\AllUsers\"

+Pop $0

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Restore user files from temp location

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function RestoreUserFiles

+

+Push $0

+Push $1

+Push $2

+

+    StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+

+  LOOP:

+    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+    StrCmp $1 "" DONE               ; no more users

+

+    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+

+    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+    ExpandEnvStrings $2 $2

+

+    CreateDirectory "$2\Application Data\SecondLife\"

+    CopyFiles "$TEMP\SecondLifeSettingsBackup\$0\*" "$2\Application Data\SecondLife\" 

+

+  CONTINUE:

+    IntOp $0 $0 + 1

+    Goto LOOP

+  DONE:

+

+Pop $2

+Pop $1

+Pop $0

+

+; Copy files in Documents and Settings\All Users\SecondLife

+Push $0

+    ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+    StrCmp $0 "" +2

+    CreateDirectory "$2\Application Data\SecondLife\"

+    CopyFiles "$TEMP\SecondLifeSettingsBackup\AllUsers\*" "$2\Application Data\SecondLife\" 

+Pop $0

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Clobber user files - TEST ONLY

+; This is here for testing, generally not desirable to call it.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;Function ClobberUserFilesTESTONLY

+

 ;Push $0

 ;Push $1

 ;Push $2

-;  DetailPrint $(RemoveCacheFilesDP)

 ;

-;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+;    StrCpy $0 0 ; Index number used to iterate via EnumRegKey

 ;

 ;  LOOP:

 ;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

@@ -317,29 +420,24 @@ FunctionEnd
 ;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

 ;    ExpandEnvStrings $2 $2

 ;

-;	; When explicitly uninstalling, everything goes away

-;    RMDir /r "$2\Application Data\SecondLife\cache"

+;    RMDir /r "$2\Application Data\SecondLife\"

 ;

 ;  CONTINUE:

 ;    IntOp $0 $0 + 1

 ;    Goto LOOP

 ;  DONE:

+;

 ;Pop $2

 ;Pop $1

 ;Pop $0

 ;

-;; Delete files in Documents and Settings\All Users\SecondLife

+;; Copy files in Documents and Settings\All Users\SecondLife

 ;Push $0

-;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

-;  StrCmp $0 "" +2

-;  RMDir /r "$0\SecondLife\cache"

+;    ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+;    StrCmp $0 "" +2

+;    RMDir /r "$2\Application Data\SecondLife\"

 ;Pop $0

 ;

-;; Delete filse in C:\Windows\Application Data\SecondLife

-;; If the user is running on a pre-NT system, Application Data lives here instead of

-;; in Documents and Settings.

-;RMDir /r "$WINDIR\Application Data\SecondLife\cache"

-;

 ;FunctionEnd

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

@@ -412,17 +510,15 @@ Push $2
     ; Required since ProfileImagePath is of type REG_EXPAND_SZ

     ExpandEnvStrings $2 $2

 

-	; If uninstalling a normal install remove everything

-	; Otherwise (preview/dmz etc) just remove cache

-    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE

-      RM_ALL:

-        RMDir /r "$2\Application Data\SecondLife"

-      RM_CACHE:

-        # Local Settings directory is the cache, there is no "cache" subdir

-        RMDir /r "$2\Local Settings\Application Data\SecondLife"

-        # Vista version of the same

-        RMDir /r "$2\AppData\Local\SecondLife"

-        Delete "$2\Application Data\SecondLife\user_settings\settings_windlight.xml"

+        ; Remove all cache and settings files but leave any other .txt files to preserve the chat logs

+;    RMDir /r "$2\Application Data\SecondLife\logs"

+    RMDir /r "$2\Application Data\SecondLife\browser_profile"

+    RMDir /r "$2\Application Data\SecondLife\user_settings"

+    Delete  "$2\Application Data\SecondLife\*.xml"

+    Delete  "$2\Application Data\SecondLife\*.bmp"

+    Delete  "$2\Application Data\SecondLife\search_history.txt"

+    Delete  "$2\Application Data\SecondLife\plugin_cookies.txt"

+    Delete  "$2\Application Data\SecondLife\typed_locations.txt"

 

   CONTINUE:

     IntOp $0 $0 + 1

@@ -440,7 +536,7 @@ Push $0
   RMDir /r "$0\SecondLife"

 Pop $0

 

-; Delete filse in C:\Windows\Application Data\SecondLife

+; Delete files in C:\Windows\Application Data\SecondLife

 ; If the user is running on a pre-NT system, Application Data lives here instead of

 ; in Documents and Settings.

 RMDir /r "$WINDIR\Application Data\SecondLife"

@@ -770,10 +866,11 @@ Call CloseSecondLife			; Make sure we're not running
 Call CheckNetworkConnection		; ping secondlife.com

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Call PreserveUserFiles

+

 ;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.

 ;Call RemoveCacheFiles			; Installing over removes potentially corrupted

 								; VFS and cache files.

-

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;;; Need to clean out shader files from previous installs to fix DEV-5663

 Call RemoveOldShaders

@@ -854,6 +951,18 @@ WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" ""
 ; write out uninstaller

 WriteUninstaller "$INSTDIR\uninst.exe"

 

+; Remove existing "Second Life Viewer 2" install if any.

+StrCmp $INSTDIR "$PROGRAMFILES\SecondLifeViewer2" SLV2_DONE ; unless that's the install directory

+IfFileExists "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" SLV2_FOUND SLV2_DONE

+

+SLV2_FOUND:

+ExecWait '"$PROGRAMFILES\SecondLifeViewer2\uninst.exe" /S _?=$PROGRAMFILES\SecondLifeViewer2'

+Delete "$PROGRAMFILES\SecondLifeViewer2\uninst.exe" ; with _? option above, uninst.exe will be left behind.

+RMDir "$PROGRAMFILES\SecondLifeViewer2" ; will remove only if empty.

+

+SLV2_DONE:

+Call RestoreUserFiles

+

 ; end of default section

 SectionEnd

 

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f0bee2bfee..0931c4ec9b 100644..100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -495,8 +495,9 @@ class WindowsManifest(ViewerManifest):
         # tag:"crash-logger" here as a cue to the exporter
         self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'],
                   dst="win_crash_logger.exe")
-        self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'],
-                  dst="updater.exe")
+# For CHOP-397, windows updater no longer used.
+#        self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'],
+#                  dst="updater.exe")
 
         if not self.is_packaging_viewer():
             self.package_file = "copied_deps"    
@@ -573,10 +574,10 @@ class WindowsManifest(ViewerManifest):
                 grid_vars_template = """
                 OutFile "%(installer_file)s"
                 !define INSTFLAGS "%(flags)s"
-                !define INSTNAME   "SecondLifeViewer2"
-                !define SHORTCUT   "Second Life Viewer 2"
+                !define INSTNAME   "SecondLifeViewer"
+                !define SHORTCUT   "Second Life Viewer"
                 !define URLNAME   "secondlife"
-                Caption "Second Life ${VERSION}"
+                Caption "Second Life"
                 """
             else:
                 # beta grid viewer
@@ -804,7 +805,7 @@ class DarwinManifest(ViewerManifest):
             self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script))
 
     def package_finish(self):
-        channel_standin = 'Second Life Viewer 2'  # hah, our default channel is not usable on its own
+        channel_standin = 'Second Life Viewer'  # hah, our default channel is not usable on its own
         if not self.default_channel():
             channel_standin = self.channel()
 
diff --git a/indra/viewer_components/updater/scripts/darwin/update_install b/indra/viewer_components/updater/scripts/darwin/update_install
index 6a95f96d86..e7f36dc5a3 100644..100755
--- a/indra/viewer_components/updater/scripts/darwin/update_install
+++ b/indra/viewer_components/updater/scripts/darwin/update_install
@@ -6,5 +6,5 @@
 #
 
 cd "$(dirname "$0")"
-(../Resources/mac-updater.app/Contents/MacOS/mac-updater -dmg "$1" -name "Second Life Viewer 2"; if [ $? -ne 0 ]; then echo $3 >> "$2"; fi;) &
+(../Resources/mac-updater.app/Contents/MacOS/mac-updater -dmg "$1" -name "Second Life Viewer"; if [ $? -ne 0 ]; then echo $3 >> "$2"; fi;) &
 exit 0
diff --git a/indra/viewer_components/updater/scripts/linux/update_install b/indra/viewer_components/updater/scripts/linux/update_install
index 88451340ec..e0505a9f72 100644..100755
--- a/indra/viewer_components/updater/scripts/linux/update_install
+++ b/indra/viewer_components/updater/scripts/linux/update_install
@@ -1,7 +1,7 @@
 #! /bin/bash
 INSTALL_DIR=$(cd "$(dirname "$0")/.." ; pwd)
 export LD_LIBRARY_PATH="$INSTALL_DIR/lib"
-bin/linux-updater.bin --file "$1" --dest "$INSTALL_DIR" --name "Second Life Viewer 2" --stringsdir "$INSTALL_DIR/skins/default/xui/en" --stringsfile "strings.xml"
+bin/linux-updater.bin --file "$1" --dest "$INSTALL_DIR" --name "Second Life Viewer" --stringsdir "$INSTALL_DIR/skins/default/xui/en" --stringsfile "strings.xml"
 
 if [ $? -ne 0 ]
    then echo $3 >> "$2"