diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 0fdf5b198..2aa020c85 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -104,7 +104,7 @@ if (VIEWER) endif (LINUX) add_subdirectory(${VIEWER_PREFIX}newview) - add_dependencies(viewer Ascent) + add_dependencies(viewer secondlife-bin) endif (VIEWER) # Linux builds the viewer and server in 2 separate projects diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake index d5174721e..12de2813a 100644 --- a/indra/cmake/CopyWinLibs.cmake +++ b/indra/cmake/CopyWinLibs.cmake @@ -371,7 +371,7 @@ if (MSVC80) ) set(all_targets ${all_targets} ${out_targets}) - set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/Ascent.exe.config) + set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config) add_custom_command( OUTPUT ${debug_appconfig_file} COMMAND ${PYTHON_EXECUTABLE} @@ -424,7 +424,7 @@ if (MSVC80) ) set(all_targets ${all_targets} ${out_targets}) - set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/Ascent.exe.config) + set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config) add_custom_command( OUTPUT ${release_appconfig_file} COMMAND ${PYTHON_EXECUTABLE} @@ -437,7 +437,7 @@ if (MSVC80) COMMENT "Creating release app config file" ) - set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Ascent.exe.config) + set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config) add_custom_command( OUTPUT ${releasesse2_appconfig_file} COMMAND ${PYTHON_EXECUTABLE} @@ -450,7 +450,7 @@ if (MSVC80) COMMENT "Creating release-sse2 app config file" ) - set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Ascent.exe.config) + set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config) add_custom_command( OUTPUT ${relwithdebinfo_appconfig_file} COMMAND ${PYTHON_EXECUTABLE} diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 00239bb53..a870c8c1a 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -121,13 +121,13 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(GRID agni CACHE STRING "Target Grid") set(VIEWER ON CACHE BOOL "Build Second Life viewer.") -set(VIEWER_CHANNEL "Ascent" CACHE STRING "Viewer Channel Name") +set(VIEWER_CHANNEL "Singularity" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") -set(VIEWER_BRANDING_ID "Ascent" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)") +set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)") # *TODO: break out proper Branding-secondlife.cmake, Branding-snowglobe.cmake, etc - set(VIEWER_BRANDING_NAME "Ascent") - set(VIEWER_BRANDING_NAME_CAMELCASE "Ascent") +set(VIEWER_BRANDING_NAME "Singularity") +set(VIEWER_BRANDING_NAME_CAMELCASE "Singularity") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") diff --git a/indra/copy_win_scripts/start-client.py b/indra/copy_win_scripts/start-client.py index cca61a57b..5f7ff2f29 100644 --- a/indra/copy_win_scripts/start-client.py +++ b/indra/copy_win_scripts/start-client.py @@ -32,7 +32,7 @@ def start_client(grid, slurl, build_config, my_args): f = open("start-client.log", "w") print >>f, "Viewer startup arguments:" llstart.start("viewer", "../../newview", - "%s/newview/%s/Ascent.exe" % (build_path, build_config), + "%s/newview/%s/secondlife-bin.exe" % (build_path, build_config), viewer_args, f) f.close() diff --git a/indra/develop.py b/indra/develop.py index c391a3f53..80af43d87 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -76,7 +76,7 @@ class PlatformSetup(object): build_type = build_types['relwithdebinfo'] standalone = 'OFF' unattended = 'OFF' - project_name = 'Ascent' + project_name = 'Singularity' distcc = True cmake_opts = [] word_size = 32 @@ -661,9 +661,9 @@ class WindowsSetup(PlatformSetup): continue vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') + ' --solution ' + - os.path.join(build_dir,'Ascent.sln') + + os.path.join(build_dir,'Singularity.sln') + ' --config ' + self.build_type + - ' --startup Ascent') + ' --startup secondlife-bin') print 'Running %r in %r' % (vstool_cmd, getcwd()) self.run(vstool_cmd) print >> open(stamp, 'w'), self.build_type diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 8eb24fda9..5d5043b37 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -38,7 +38,7 @@ const S32 LL_VERSION_MINOR = 5; const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; -const char * const LL_CHANNEL = "Ascent Viewer Release"; +const char * const LL_CHANNEL = "Singularity Viewer"; #if LL_DARWIN const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.snowglobe.viewer"; diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 45055007a..e6b02f69f 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -247,7 +247,7 @@ std::string LLDir::buildSLOSCacheDir() const } else { - res = getOSCacheDir() + mDirDelimiter + "Ascent"; + res = getOSCacheDir() + mDirDelimiter + "SingularityViewer"; } return res; } diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 342136a83..bb665a872 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac() if (error == noErr) { FSRefToLLString(&cacheDirRef, mOSCacheDir); - (void)CFCreateDirectory(&cacheDirRef, CFSTR("Ascent"), NULL); + (void)CFCreateDirectory(&cacheDirRef, CFSTR("SingularityViewer"), NULL); } // mOSUserAppDir diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 12f3463bf..01db449b7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -503,7 +503,7 @@ set(viewer_SOURCE_FILES ) # This gets renamed in the packaging step -set(VIEWER_BINARY_NAME "Ascent" CACHE STRING +set(VIEWER_BINARY_NAME "secondlife-bin" CACHE STRING "The name of the viewer executable to create.") if (LINUX) diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index b7654e22f..755157d20 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -113,7 +113,7 @@ if [ -n "$LL_TCMALLOC" ]; then fi fi -export VIEWER_BINARY='Ascent-do-not-run-directly' +export VIEWER_BINARY='singularity-do-not-run-directly' export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' export SL_CMD='$LL_WRAPPER bin/$VIEWER_BINARY' export SL_OPT="`cat gridargs.dat` $@" diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 53f4e7de6..cd7fd7365 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -319,7 +319,7 @@ static BOOL gDoDisconnect = FALSE; static std::string gLaunchFileOnQuit; // Used on Win32 for other apps to identify our window (eg, win_setup) -const char* const VIEWER_WINDOW_CLASSNAME = "Ascent"; +const char* const VIEWER_WINDOW_CLASSNAME = "SingularityViewer"; //---------------------------------------------------------------------------- // File scope definitons @@ -2007,7 +2007,7 @@ bool LLAppViewer::initConfiguration() mYieldTime = gSavedSettings.getS32("YieldTime"); // XUI:translate - gSecondLife = "Ascent"; + gSecondLife = "Singularity Viewer"; // Read skin/branding settings if specified. //if (! gDirUtilp->getSkinDir().empty() ) @@ -2230,10 +2230,7 @@ bool LLAppViewer::initWindow() // always start windowed BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth"); - // - //gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life", - gViewerWindow = new LLViewerWindow("Ascent", "Second Life", - // + gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life", gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"), gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"), FALSE, ignorePixelDepth); diff --git a/indra/newview/llnotify.cpp b/indra/newview/llnotify.cpp index 5cad338fa..b69d164b0 100644 --- a/indra/newview/llnotify.cpp +++ b/indra/newview/llnotify.cpp @@ -547,7 +547,7 @@ void LLNotifyBox::format(std::string& msg, const LLStringUtil::format_map_t& arg // XUI:translate! LLStringUtil::format_map_t targs = args; targs["[SECOND_LIFE]"] = "Second Life"; - targs["[VIEWER_NAME]"] = "Ascent"; + targs["[VIEWER_NAME]"] = "Singularity Viewer"; LLStringUtil::format(msg, targs); } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index df8b9edc9..e468d2edf 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -751,7 +751,7 @@ void init_menus() // TomY TODO convert these two LLMenuGL*menu; - menu = new LLMenuGL("Ascent"); + menu = new LLMenuGL("Singularity"); menu->append(new LLMenuItemCallGL( "Close All Dialogs", &handle_close_all_notifications, NULL, NULL, 'D', MASK_CONTROL | MASK_ALT | MASK_SHIFT)); menu->appendSeparator(); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f1a036288..8b18d5db6 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3269,7 +3269,7 @@ void LLVOAvatar::idleUpdateWindEffect() bool LLVOAvatar::updateClientTags() { std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml"); - LLSD response = LLHTTPClient::blockingGet("http://ascentviewer.com/updates/client_definitions.xml"); + LLSD response = LLHTTPClient::blockingGet("http://viewertags.com/app/client_list.xml"); if(response.has("body")) { const LLSD &client_list = response["body"]; 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 9b6d8db3d..1090f3607 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 Singularity Viewer" width="470"> - diff --git a/indra/newview/skins/default/xui/en-us/panel_login.xml b/indra/newview/skins/default/xui/en-us/panel_login.xml index 55d5a2e6f..996582b82 100644 --- a/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/indra/newview/skins/default/xui/en-us/panel_login.xml @@ -6,7 +6,7 @@ start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" top="-1" /> - http://ascent.balseraph.org/ + http://secondlife.com/app/login/ http://secondlife.com/account/request.php diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml index bb1b49fb7..7aed4596d 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml @@ -1,7 +1,7 @@ - + diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c5f40f64a..879b4416a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -134,7 +134,7 @@ class ViewerManifest(LLManifest): def installer_prefix(self): mapping={"secondlife":'SecondLife_', "snowglobe":'Snowglobe_', - "Ascent":'Ascent_'} + "singularity":'Singularity_'} return mapping[self.viewer_branding_id()] def flags_list(self): @@ -170,22 +170,14 @@ class ViewerManifest(LLManifest): class WindowsManifest(ViewerManifest): def final_exe(self): - if self.default_channel() and self.viewer_branding_id()=="secondlife": - if self.default_grid(): - return "Ascent.exe" - else: - return "Ascent.exe" - elif(self.viewer_branding_id=="snowglobe"): - return "Ascent.exe" - else: - return 'Ascent.exe' + return 'Singularity.exe' def construct(self): super(WindowsManifest, self).construct() # the final exe is complicated because we're not sure where it's coming from, # nor do we have a fixed name for the executable - self.path(self.find_existing_file('debug/Ascent.exe', 'release/Ascent.exe', 'releaseSSE2/Ascent.exe', 'relwithdebinfo/Ascent.exe'), dst=self.final_exe()) + self.path(self.find_existing_file('debug/secondlife-bin.exe', 'releaseSSE2/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe()) # Plugin host application self.path(os.path.join(os.pardir, @@ -264,7 +256,7 @@ class WindowsManifest(ViewerManifest): self.end_prefix() # The config file name needs to match the exe's name. - self.path(src="%s/Ascent.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") + self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") # Vivox runtimes if self.prefix(src="vivox-runtime/i686-win32", dst=""): @@ -290,9 +282,9 @@ class WindowsManifest(ViewerManifest): dst="updater.exe") # For google-perftools tcmalloc allocator. - #if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): - # self.path("libtcmalloc_minimal.dll") - # self.end_prefix() + if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): + self.path("libtcmalloc_minimal.dll") + self.end_prefix() def nsi_file_commands(self, install=True): @@ -471,7 +463,8 @@ class DarwinManifest(ViewerManifest): self.path("featuretable_mac.txt") self.path("SecondLife.nib") - self.path("Ascent.icns") + # SG:TODO + self.path("singularity.icns") # Translations self.path("English.lproj") @@ -540,16 +533,10 @@ class DarwinManifest(ViewerManifest): { 'viewer_binary' : self.dst_path_of('Contents/MacOS/'+self.app_name())}) def app_name(self): - mapping={"secondlife":"Second Life", - "snowglobe":"Snowglobe", - "Ascent":"Ascent"} - return mapping[self.viewer_branding_id()] + return "Singularity" def info_plist_name(self): - mapping={"secondlife":"Info-SecondLife.plist", - "snowglobe":"Info-Snowglobe.plist", - "Ascent":"Info-Ascent.plist"} - return mapping[self.viewer_branding_id()] + return "Info-Singularity.plist" def package_finish(self): channel_standin = self.app_name() @@ -663,7 +650,7 @@ class LinuxManifest(ViewerManifest): self.path("secondlife-stripped","bin/"+self.binary_name()) self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") else: - self.path("Ascent","bin/"+self.binary_name()) + self.path("secondlife-bin","bin/"+self.binary_name()) self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin") self.path("linux_tools/launch_url.sh","launch_url.sh") @@ -685,22 +672,13 @@ class LinuxManifest(ViewerManifest): self.path("featuretable_linux.txt") def wrapper_name(self): - mapping={"secondlife":"secondlife", - "snowglobe":"snowglobe", - "Ascent":"Ascent"} - return mapping[self.viewer_branding_id()] + return 'singularity' def binary_name(self): - mapping={"secondlife":"Ascent-do-not-run-directly", - "snowglobe":"Ascent-do-not-run-directly", - "Ascent":"Ascent-do-not-run-directly"} - return mapping[self.viewer_branding_id()] + return 'singularity-do-not-run-directly' def icon_name(self): - mapping={"secondlife":"secondlife_icon.png", - "snowglobe":"snowglobe_icon.png", - "Ascent":"Ascent_icon.png"} - return mapping[self.viewer_branding_id()] + return "snowglobe_icon.png" def package_finish(self): if 'installer_name' in self.args: @@ -715,7 +693,6 @@ class LinuxManifest(ViewerManifest): else: installer_name += '_' + self.channel_oneword().upper() - installer_name = 'Ascent' # Fix access permissions self.run_command(""" @@ -729,7 +706,6 @@ class LinuxManifest(ViewerManifest): # temporarily move directory tree so that it has the right # name in the tarfile - self.run_command("rm '%s'" % self.build_path_of(installer_name)) self.run_command("mv '%(dst)s' '%(inst)s'" % { 'dst': self.get_dst_prefix(), 'inst': self.build_path_of(installer_name)})