From 4dfb74c99528dfda73f6219248acb84190c50090 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 4 Nov 2014 14:54:35 -0500
Subject: [PATCH] [OnLook] Rebranding part 1

---
 indra/cmake/Variables.cmake                    | 4 ++--
 indra/develop.py                               | 2 +-
 indra/llcommon/llversionviewer.h.in            | 2 +-
 indra/newview/app_settings/settings_ascent.xml | 4 ++--
 indra/newview/lluserauth.cpp                   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index a8df1d307..1e050d8d3 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -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}")
diff --git a/indra/develop.py b/indra/develop.py
index d3a77ae07..70c8cf062 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -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
diff --git a/indra/llcommon/llversionviewer.h.in b/indra/llcommon/llversionviewer.h.in
index 76d53b926..edc9d0eb4 100644
--- a/indra/llcommon/llversionviewer.h.in
+++ b/indra/llcommon/llversionviewer.h.in
@@ -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
diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index 5d49b854c..dfaaf07af 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -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-->
diff --git a/indra/newview/lluserauth.cpp b/indra/newview/lluserauth.cpp
index 4c5645e12..f002122c6 100644
--- a/indra/newview/lluserauth.cpp
+++ b/indra/newview/lluserauth.cpp
@@ -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";
 	}