diff options
| author | Don Kjer <don@lindenlab.com> | 2011-06-13 22:25:29 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-06-13 22:25:29 +0000 |
| commit | 1fbf3e0ec297004879d766cad11c5e9e15b86d4b (patch) | |
| tree | be106ed2b6275e52e7753ee2e9c1a84ccea73aad | |
| parent | 45c6dcbe87fbfc1351e4faa9ef3196a191b7dd69 (diff) | |
| parent | e35cc6f42b4c02f1d7a05083c3b14de6c222f90a (diff) | |
Merge viewer-development -> viewer-sandbox
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | BuildParams | 5 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -130,3 +130,4 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release 0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1 0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1 9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start +6a3e7e403bd19e45fdfc2fcc716867af3ab80861 2.7.3-start diff --git a/BuildParams b/BuildParams index a064faf870..c303bd2e5e 100644 --- a/BuildParams +++ b/BuildParams @@ -178,9 +178,10 @@ oz_viewer-devreview.build_debug_release_separately = true oz_project-1.build_debug_release_separately = true oz_project-2.build_debug_release_separately = true oz-project-3.build_debug_release_separately = true - - oz_viewer-beta-review.build_debug_release_separately = true +oz_viewer-poreview.build_debug_release_separately = true +oz_viewer-poreview.codeticket_add_context = false + # ======================================== # enus # ======================================== diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index fa92a3a75b..cfafbf0470 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 = 7; -const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |