From 6808543bd1845a4c17f1ca5f248a29b0314a25ae Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Tue, 4 Nov 2014 17:14:30 -0500 Subject: [PATCH] [OnLook] Rebranding part 3 --- README | 60 +++++++++---------- indra/llvfs/lldir.cpp | 6 +- indra/llvfs/lldir_mac.cpp | 4 +- indra/newview/llappviewer.cpp | 26 ++++---- indra/newview/llcrashlogger.cpp | 2 +- .../skins/default/xui/en-us/floater_about.xml | 1 + 6 files changed, 48 insertions(+), 51 deletions(-) diff --git a/README b/README index 8d470c1c9..3bdb046c5 100644 --- a/README +++ b/README @@ -1,38 +1,34 @@ -00000000011111111112222222222333333333344444444445555555555666666666677777777778 -12345678901234567890123456789012345678901234567890123456789012345678901234567890 - ______ ___ __ _ _____ _ _ ______ _____ ___ _____ _ _ - |_____ | | \ | | ___ | | | |____| |____/ | | \_/ - _____| _|_ | \_| |____| |____| |____ | | | \_ _|_ | | - _ _ _ ____ _ _ ____ ____ - \/ | |=== |/\| |=== |--< + ___ _ _ __ __ _ + / _ \ _ __ | | ___ ___ | | __ \ \ / /(_) ___ __ __ ___ _ __ +| | | || '_ \ | | / _ \ / _ \ | |/ / \ \ / / | | / _ \\ \ /\ / // _ \| '__| +| |_| || | | || |___| (_) || (_) || < \ V / | || __/ \ V V /| __/| | + \___/ |_| |_||_____|\___/ \___/ |_|\_\ \_/ |_| \___| \_/\_/ \___||_| -Sin-gu-la-ri-ty (noun) - a distinctive feature, a uniqueness; a point at which -continuity breaks up; a point in history at which machine becomes smarter than -humanity and/or fuses with it indivisively; or simply a cool sounding word with -the initials S.G. in it :) - -Singularity Viewer is a SecondLife(tm) protocol compatible client application. -It can be used to access SecondLife services as well as a number of others such -as those based upon the OpenSim platform. +The OnLook Viewer is a client for OpenSimulator virtual environments +(http://opensimulator.org) based off the Singularity Viewer +(http://www.singularityviewer.org/). We believe the User Interface +(UI) should, and can, be made different for different virtual +environments, and that the best people to determine the UI are the +designers of the virtual environments themselves. As such, the main +goal of OnLook is to support a large variety of UIs in these virtual +environments. Specifically, OnLook allows the server-side to reify several +aspects of the viewer's GUI and user controls. -Singularity is maintained by a small group of volunteers who can be contacted -both, in-world (SingularityViewer group) as well as on IRC (#SingularityViewer -@ FreeNode). Bug requests and features requests can be submitted through our -Issue Tracker (http://code.google.com/p/singularity-viewer/issues/list or from -the viewer menu: Help --> Bug Reporting --> Singularity Issue Tracker...) +OnLook can be used for any OpenSimulator virtual environment, +independent of their configuration. However, its server-side UI +definitions require advanced OpenSimulator modules that can be found +in the OpenSimulator.OptionalModules component. +While OnLook strives to keep up with Singularity, it does not aim at +staying compatible with Second Life. OnLook is not an approved TPV +viewer for SL, and it should not be used there. -As this Readme grows out of date, please refer to +OnLook is originally a project made for Encitra (http://www.encitra.com) +with the goal of giving urban planners a very simple and uncluttered +interface to its 4D urban models. The project is open source and is +made available to everyone who uses OpenSimulator. - http://www.singularityviewer.org/about - - -00000000011111111112222222222333333333344444444445555555555666666666677777777778 -12345678901234567890123456789012345678901234567890123456789012345678901234567890 - -History - -The Singularity viewer was started by Siana Gearz in November 2010 by forking it -from the Ascent Viewer, by Balseraph Software Group, which in turn was based upon -source code modified from the snowglobe source code released by Linden Lab. +The OnLook viewer is maintained by Diva Canto, Liru Faers and Nebadon +Izumi. We welcome contributions, especially those that are aligned +with the goal of the project: server-side-defined UI. diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 26c5c11b7..6d2165f95 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -311,7 +311,7 @@ const std::string &LLDir::getDumpDir() const + "dump-" + uid.asString(); */ - sDumpDir = getExpandedFilename(LL_PATH_LOGS, "") + "singularity-debug"; + sDumpDir = getExpandedFilename(LL_PATH_LOGS, "") + "onlook-debug"; dir_exists_or_crash(sDumpDir); } @@ -364,9 +364,9 @@ std::string LLDir::buildSLOSCacheDir() const else { #if defined(_WIN64) - res = add(getOSCacheDir(), "SingularityViewer64"); + res = add(getOSCacheDir(), "OnLookViewer64"); #else - res = add(getOSCacheDir(), "SingularityViewer"); + res = add(getOSCacheDir(), "OnLookViewer"); #endif } return res; diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index b6ba5e308..11c505def 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -117,7 +117,7 @@ LLDir_Mac::LLDir_Mac() CFStringRef stringRef = NULL; OSStatus error = noErr; FSRef fileRef; - CFStringRef secondLifeString = CFSTR("SecondLife"); + CFStringRef secondLifeString = CFSTR("OnLook"); mainBundleRef = CFBundleGetMainBundle(); @@ -193,7 +193,7 @@ LLDir_Mac::LLDir_Mac() if (error == noErr) { FSRefToLLString(&cacheDirRef, mOSCacheDir); - (void)CFCreateDirectory(&cacheDirRef, CFSTR("SingularityViewer"), NULL); + (void)CFCreateDirectory(&cacheDirRef, CFSTR("OnLookViewer"), NULL); } // mOSUserAppDir diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8c3bca786..aae0b377d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -302,12 +302,12 @@ BOOL gLogoutInProgress = FALSE; // Internal globals... that should be removed. static std::string gArgs; -const std::string MARKER_FILE_NAME("Singularity.exec_marker"); -const std::string ERROR_MARKER_FILE_NAME("Singularity.error_marker"); -const std::string LLERROR_MARKER_FILE_NAME("Singularity.llerror_marker"); -const std::string LOGOUT_MARKER_FILE_NAME("Singularity.logout_marker"); -const std::string LOG_FILE("Singularity.log"); -extern const std::string OLD_LOG_FILE("Singularity.old"); +const std::string MARKER_FILE_NAME("OnLook.exec_marker"); +const std::string ERROR_MARKER_FILE_NAME("OnLook.error_marker"); +const std::string LLERROR_MARKER_FILE_NAME("OnLook.llerror_marker"); +const std::string LOGOUT_MARKER_FILE_NAME("OnLook.logout_marker"); +const std::string LOG_FILE("OnLook.log"); +extern const std::string OLD_LOG_FILE("OnLook.old"); static BOOL gDoDisconnect = FALSE; static std::string gLaunchFileOnQuit; @@ -568,7 +568,7 @@ LLAppViewer::LLAppViewer() : // Need to do this initialization before we do anything else, since anything // that touches files should really go through the lldir API - gDirUtilp->initAppDirs("SecondLife"); + gDirUtilp->initAppDirs("OnLook"); sInstance = this; } @@ -1982,7 +1982,7 @@ bool init_logging() std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LOG_FILE); LLFile::rename(log_file, old_log_file); - // Set the log file to Singularity.log + // Set the log file to OnLook.log LLError::logToFile(log_file); @@ -2385,7 +2385,7 @@ bool LLAppViewer::initConfiguration() } // XUI:translate - gSecondLife = "Singularity Viewer"; + gSecondLife = "OnLook Viewer"; // Read skin/branding settings if specified. //if (! gDirUtilp->getSkinDir().empty() ) @@ -2919,10 +2919,10 @@ void LLAppViewer::initMarkerFile() LL_DEBUGS("MarkerFile") << "Checking marker file for lock..." << LL_ENDL; //We've got 4 things to test for here - // - Other Process Running (Singularity.exec_marker present, locked) - // - Freeze (Singularity.exec_marker present, not locked) - // - LLError Crash (Singularity.llerror_marker present) - // - Other Crash (Singularity.error_marker present) + // - Other Process Running (OnLook.exec_marker present, locked) + // - Freeze (OnLook.exec_marker present, not locked) + // - LLError Crash (OnLook.llerror_marker present) + // - Other Crash (OnLook.error_marker present) // These checks should also remove these files for the last 2 cases if they currently exist //LLError/Error checks. Only one of these should ever happen at a time. diff --git a/indra/newview/llcrashlogger.cpp b/indra/newview/llcrashlogger.cpp index 3a2a8c742..edd7b6084 100644 --- a/indra/newview/llcrashlogger.cpp +++ b/indra/newview/llcrashlogger.cpp @@ -368,7 +368,7 @@ bool LLCrashLogger::sendCrashLog(std::string dump_dir) gDirUtilp->setDumpDir( dump_dir ); std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "SingularityCrashReport"); + "OnLookCrashReport"); std::string report_file = dump_path + ".log"; gatherFiles(); 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 a94a96aa9..91b2799c8 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -12,6 +12,7 @@ +[APP_NAME] is developed and maintained by Diva Canto, Liru Faers, and Nebadon Izumi for Encitra; it is based off of Singularity Viewer. Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Damian Zhaoying, Fractured Crystal, Franxisco Romano, Fritigern Gothly, Henri Beauchamp, Kadah Coba, Kitty Barnett, Knolan Falconer, McCabe Maxsted, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Wolfspirit Magic, Zauber Parecelsus and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code. Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, and Zipherius Turas.