From 12e72e3736457d70f89faa74b81dec50faef65fa Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 22 Sep 2010 10:34:43 -0400
Subject: [PATCH] SH-150 FIX - build params changes for mesh beta viewer, flag
in window title
---
BuildParams | 4 ++--
indra/llcommon/llversionviewer.h | 2 +-
indra/newview/llappviewer.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/BuildParams b/BuildParams
index 7d929646a91..630d4be2dd6 100755
--- a/BuildParams
+++ b/BuildParams
@@ -88,8 +88,8 @@ viewer-mesh.build_hg_bundle = true
viewer-mesh.build_viewer_update_version_manager = false
viewer-mesh.build_Debug = false
viewer-mesh.build_RelWithDebInfo = false
-viewer-mesh.viewer_channel = "Second Life Mesh Beta"
-viewer-mesh.login_channel = "Second Life Mesh Beta"
+viewer-mesh.viewer_channel = "Project Viewer - Mesh"
+viewer-mesh.login_channel = "Project Viewer - Mesh"
viewer-mesh.viewer_grid = aditi
viewer-mesh.email = shining@lists.lindenlab.com
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index c430a60ff0a..235f806c8ec 100755
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 1;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c07d8918001..b989256fd19 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -306,7 +306,7 @@ BOOL gLogoutInProgress = FALSE;
////////////////////////////////////////////////////////////
// Internal globals... that should be removed.
-static std::string gArgs;
+static std::string gArgs = "Mesh Beta";
const std::string MARKER_FILE_NAME("SecondLife.exec_marker");
const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker");
--
GitLab