From df633558e4b0446e71e0cf6668a229959754e9ba Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 10 Mar 2011 16:42:07 -0500 Subject: add parameters for pre-release repo --- BuildParams | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 8e036ab56b..934bed6c5f 100644 --- a/BuildParams +++ b/BuildParams @@ -57,6 +57,12 @@ viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true viewer-release.release-viewer.jira = DRTVWR-13 +viewer-pre-release.viewer_channel = "Second Life Release" +viewer-pre-release.login_channel = "Second Life Release" +viewer-pre-release.build_debug_release_separately = true +viewer-pre-release.build_viewer_update_version_manager = true +#viewer-pre-release.release-viewer.jira = DRTVWR-13 + # ======================================== # aimee # ======================================== -- cgit v1.3 From 742dd75751f65224d80eb4f7d20daf5a21776c5f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 15 Mar 2011 16:14:07 -0400 Subject: increment viewer version to 2.6.1 --- BuildParams | 5 +++++ indra/llcommon/llversionviewer.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 934bed6c5f..d4b1800508 100644 --- a/BuildParams +++ b/BuildParams @@ -48,6 +48,11 @@ viewer-beta.login_channel = "Second Life Beta Viewer" viewer-beta.build_debug_release_separately = true viewer-beta.build_viewer_update_version_manager = true +viewer-pre-beta.viewer_channel = "Second Life Beta Viewer" +viewer-pre-beta.login_channel = "Second Life Beta Viewer" +viewer-pre-beta.build_debug_release_separately = true +viewer-pre-beta.build_viewer_update_version_manager = true + # ======================================== # Viewer Release # ======================================== diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7d5afe92dc..117d96ffa6 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; -- cgit v1.3