admin/OnLook
1
0
Fork 0
mirror of https://github.com/diva/OnLook.git synced 2026-08-14 00:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OnLook] Rebranding part 1

Browse Source
This commit is contained in:
Inusaito Sayori
2014-11-04 14:54:35 -05:00
parent 69c35611d8
commit 4dfb74c995
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/cmake/Variables.cmake
+2 -2
View File
@@ -169,9 +169,9 @@ endif(WINDOWS AND WORD_SIZE EQUAL 32)
# Default deploy grid
set(GRID agni CACHE STRING "Target Grid")
set(VIEWER_CHANNEL "Singularity" CACHE STRING "Viewer Channel Name")
set(VIEWER_CHANNEL "OnLook" CACHE STRING "Viewer Channel Name")
set(VIEWER_LOGIN_CHANNEL "${VIEWER_CHANNEL}" CACHE STRING "Fake login channel for A/B Testing")
set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)")
set(VIEWER_BRANDING_ID "onlook" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)")
# *TODO: break out proper Branding-secondlife.cmake, Branding-snowglobe.cmake, etc
string(REGEX REPLACE " +" "" VIEWER_CHANNEL_ONE_WORD "${VIEWER_CHANNEL}")
indra/develop.py
+1 -1
View File
@@ -80,7 +80,7 @@ class PlatformSetup(object):
standalone = 'OFF'
unattended = 'OFF'
universal = 'OFF'
project_name = 'Singularity'
project_name = 'OnLook'
distcc = True
cmake_opts = []
word_size = 32
indra/llcommon/llversionviewer.h.in
+1 -1
View File
@@ -41,7 +41,7 @@ const S32 LL_VERSION_BUILD = ${vBUILD};
const char * const LL_CHANNEL = "${VIEWER_CHANNEL}";
#if LL_DARWIN
const char * const LL_VERSION_BUNDLE_ID = "org.singularityviewer.singularity";
const char * const LL_VERSION_BUNDLE_ID = "org.onlookviewer.onlook";
#endif
#endif
indra/newview/app_settings/settings_ascent.xml
+2 -2
View File
@@ -894,7 +894,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://singularity-viewer.github.io</string>
<string/>
</map>
<key>SingularitySplashPagePath</key>
<map>
@@ -905,7 +905,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>pages/login/</string>
<string/>
</map>
<!-- The following block of settings say whether or not a toolbar button is visible in
the future, we want this block gone, upstream handles this sorta thing much better-->
indra/newview/lluserauth.cpp
+2 -2
View File
@@ -218,12 +218,12 @@ void LLUserAuth::authenticate(
XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
XMLRPC_VectorAppendString(params, "version", llformat("%d.%d.%d.%d", gVersionMajor, gVersionMinor, gVersionPatch, gVersionBuild).c_str(), 0);
// Singu Note: At the request of Linden Lab we change channel sent to the login server in the following way:
// * If channel is "Singularity" we change it to "Singularity Release", due to their statistics system
// * If channel is "OnLook" we change it to "OnLook Release", due to their statistics system
// not being able to distinguish just the release version
// * We append "64" to channel name on 64-bit for systems for the LL stats system to be able to produce independent
// crash statistics depending on the architecture
std::string chan(gVersionChannel);
if (chan == "Singularity")
if (chan == "OnLook")
{
chan += " Release";
}