diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e27156e5a..71d009510 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8477,7 +8477,7 @@ This should be as low as possible, but too low may break functionality Type Boolean Value - 0 + 1 ForceMandatoryUpdate diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index e78317e3f..3f2cfbd0f 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -31,6 +31,7 @@ RequestExecutionLevel admin ; on Vista we must be admin because we write to Prog ;; !define INSTNAME "SecondLife%(grid_caps)s" ;; !define SHORTCUT "Second Life (%(grid_caps)s)" ;; !define URLNAME "secondlife%(grid)s" +;; !define AUTHOR "Linden Research, Inc." ;; !define UNINSTALL_SETTINGS 1 %%GRID_VARS%% @@ -76,8 +77,8 @@ Name "${VIEWERNAME}" SubCaption 0 $(LicenseSubTitleSetup) ; override "license agreement" text BrandingText "Prepare to Implode!" ; bottom of window text -Icon %%SOURCE%%\installers\windows\install_icon_singularity.ico -UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon_singularity.ico +Icon %%SOURCE%%\installers\windows\${INSTALL_ICON} +UninstallIcon %%SOURCE%%\installers\windows\${UNINSTALL_ICON} WindowIcon off ; show our icon in left corner # BGGradient 9090b0 000000 notext CRCCheck on ; make sure CRC is OK @@ -89,7 +90,7 @@ SetOverwrite on ; stomp files by default AutoCloseWindow true ; after all files install, close window InstallDir "%%INSTALLDIR%%" -InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "" +InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" "" DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -191,7 +192,7 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Function CheckIfAlreadyCurrent Push $0 - ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" + ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Version" StrCmp $0 ${VERSION_LONG} 0 DONE MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE Quit @@ -550,7 +551,7 @@ SetShellVarContext all Call un.CloseSecondLife ; Clean up registry keys and subkeys (these should all be !defines somewhere) -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" ; Clean up shortcuts @@ -693,7 +694,7 @@ lbl_check_silent: ; If we currently have a version of SL installed, default to the language of that install ; Otherwise don't change $LANGUAGE and it will default to the OS UI language. - ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" + ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" "InstallerLanguage" IfErrors lbl_build_menu StrCpy $LANGUAGE $0 @@ -711,7 +712,7 @@ lbl_build_menu: StrCpy $LANGUAGE $0 ; save language in registry - WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE + WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" "InstallerLanguage" $LANGUAGE lbl_return: Pop $0 Return @@ -721,7 +722,7 @@ FunctionEnd Function un.onInit ; read language from registry and set for uninstaller ; Key will be removed on successful uninstall - ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" + ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" "InstallerLanguage" IfErrors lbl_end StrCpy $LANGUAGE $0 lbl_end: @@ -810,11 +811,11 @@ CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Write registry -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR" -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}" -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS" -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT" -WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE" +WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "" "$INSTDIR" +WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Version" "${VERSION_LONG}" +WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Flags" "$INSTFLAGS" +WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Shortcut" "$INSTSHORTCUT" +WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Exe" "$INSTEXE" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe"' diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4647bd8cb..45fa8dcd7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -355,6 +355,7 @@ void init_default_trans_args() { default_trans_args.insert("SECOND_LIFE"); // World default_trans_args.insert("APP_NAME"); + default_trans_args.insert("SHORT_APP_NAME"); default_trans_args.insert("CAPITALIZED_APP_NAME"); default_trans_args.insert("SECOND_LIFE_GRID"); default_trans_args.insert("SUPPORT_SITE"); @@ -2363,23 +2364,6 @@ bool LLAppViewer::initConfiguration() #if LL_DARWIN // Initialize apple menubar and various callbacks init_apple_menu(LLTrans::getString("APP_NAME").c_str()); - -#if __ppc__ - // If the CPU doesn't have Altivec (i.e. it's not at least a G4), don't go any further. - // Only test PowerPC - all Intel Macs have SSE. - if(!gSysCPU.hasAltivec()) - { - std::ostringstream msg; - msg << LLTrans::getString("MBRequiresAltiVec"); - OSMessageBox( - msg.str(), - LLStringUtil::null, - OSMB_OK); - removeMarkerFile(); - return false; - } -#endif - #endif // LL_DARWIN // Display splash screen. Must be after above check for previous diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 6f0cdf10c..a219868d3 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -647,7 +647,7 @@ void LLPanelLogin::updateLocationSelectorsVisibility() sInstance->getChildView("location_panel")->setVisible(show_start); - bool show_server = true; + bool show_server = gSavedSettings.getBOOL("ForceShowGrid"); sInstance->getChildView("grids_panel")->setVisible(show_server); } diff --git a/indra/newview/res/singularity.icns b/indra/newview/res/singularity_icon.icns similarity index 100% rename from indra/newview/res/singularity.icns rename to indra/newview/res/singularity_icon.icns diff --git a/indra/newview/res/viewerRes.rc.in b/indra/newview/res/viewerRes.rc.in index 0ca054f5a..0119f9fd9 100644 --- a/indra/newview/res/viewerRes.rc.in +++ b/indra/newview/res/viewerRes.rc.in @@ -61,8 +61,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_LL_ICON ICON "singularity_icon.ico" -IDI_LCD_LL_ICON ICON "singularity_icon.ico" +IDI_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon.ico" +IDI_LCD_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Sans Serif" BEGIN ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 - LTEXT "Loading Second Life...",666,36,13,91,8 + LTEXT "Loading ${VIEWER_CHANNEL}...",666,36,13,91,8 END diff --git a/indra/newview/res/viewerRes_bc.rc.in b/indra/newview/res/viewerRes_bc.rc.in index a9bdd7c8d..3413cf937 100644 --- a/indra/newview/res/viewerRes_bc.rc.in +++ b/indra/newview/res/viewerRes_bc.rc.in @@ -61,8 +61,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_LL_ICON ICON "singularity_icon_bc.ico" -IDI_LCD_LL_ICON ICON "singularity_icon_bc.ico" +IDI_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon_bc.ico" +IDI_LCD_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon_bc.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Sans Serif" BEGIN ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 - LTEXT "Loading Second Life...",666,36,13,91,8 + LTEXT "Loading ${VIEWER_CHANNEL}...",666,36,13,91,8 END diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml index 1d4e1d275..a94a96aa9 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -2,7 +2,7 @@ + title="About [SHORT_APP_NAME]" width="470"> @@ -31,7 +31,7 @@ Collada DOM Copyright 2006 Sony Computer Entertainment Inc. cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. expat Copyright (C) 1998-2000 Thai Open Source Software Center Ltd., 2001-2006 Expat maintainers. -FMOD Sound System, Copyright (C) 1994-2012 Firelight Technologies Pty, Ltd. +FMOD Sound System, Copyright (C) 1994-2013 Firelight Technologies Pty, Ltd. FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). GL Copyright (C) 1999-2004 Brian Paul. GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. diff --git a/indra/newview/skins/default/xui/en-us/menu_login.xml b/indra/newview/skins/default/xui/en-us/menu_login.xml index 6674ccd3a..35ac6f7e3 100644 --- a/indra/newview/skins/default/xui/en-us/menu_login.xml +++ b/indra/newview/skins/default/xui/en-us/menu_login.xml @@ -21,10 +21,10 @@ - - + diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 7a18093a4..78b13ba8b 100644 --- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -895,7 +895,7 @@ - @@ -944,7 +944,7 @@ - @@ -971,8 +971,8 @@ - + @@ -985,7 +985,7 @@ - + diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml index 77e3f12de..b23b8e948 100644 --- a/indra/newview/skins/default/xui/en-us/strings.xml +++ b/indra/newview/skins/default/xui/en-us/strings.xml @@ -27,6 +27,7 @@ Make sure you entered the correct Login URI. An example of a Login URI is: \"htt Second Life Singularity Viewer SINGULARITY VIEWER + Singularity Second Life Grid Second Life Support Portal diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7b86acdf9..9a284bcf2 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -406,6 +406,8 @@ class WindowsManifest(ViewerManifest): 'inst_name':self.channel_oneword() + ' (64 bit)' if self.is_win64() else self.channel_oneword(), 'installer_file':self.installer_file(), 'viewer_name': "%s%s" % (self.channel(), " (64 bit)" if self.is_win64() else "" ), + 'install_icon': "install_icon_%s.ico" % self.viewer_branding_id(), + 'uninstall_icon': "uninstall_icon_%s.ico" % self.viewer_branding_id(), } version_vars = """ @@ -422,8 +424,9 @@ class WindowsManifest(ViewerManifest): !define INSTNAME "%(inst_name)s" !define SHORTCUT "%(viewer_name)s Viewer" !define URLNAME "secondlife" - !define INSTALL_ICON "install_icon_singularity.ico" - !define UNINSTALL_ICON "install_icon_singularity.ico" + !define INSTALL_ICON "%(install_icon)s" + !define UNINSTALL_ICON "%(uninstall_icon)s" + !define AUTHOR "Linden Research, Inc." #TODO: Hook this up to cmake et al for easier branding. Caption "${VIEWERNAME} ${VERSION_LONG}" """ if 'installer_name' in self.args: @@ -493,8 +496,7 @@ class DarwinManifest(ViewerManifest): self.path("featuretable_mac.txt") self.path("SecondLife.nib") - # SG:TODO - self.path("../newview/res/singularity.icns", dst="singularity.icns") + self.path(("../newview/res/%s_icon.icns" % self.viewer_branding_id()), dst=("%s_icon.icns" % self.viewer_branding_id())) # Translations self.path("English.lproj")