summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/llcommon/llversionserver.h4
-rwxr-xr-xscripts/update_version_files.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 03bc415af3..ac1422cb07 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -11,8 +11,8 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 46464;
+const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_BUILD = 70368;
const char * const LL_CHANNEL = "Second Life Server";
diff --git a/scripts/update_version_files.py b/scripts/update_version_files.py
index b234ae0ed1..8c500e4e08 100755
--- a/scripts/update_version_files.py
+++ b/scripts/update_version_files.py
@@ -174,9 +174,9 @@ def main():
print
# Determine new channel(s)
- if new_viewer_channel != None:
+ if new_viewer_channel != None and len(new_viewer_channel) > 0:
viewer_channel = new_viewer_channel
- if new_server_channel != None:
+ if new_server_channel != None and len(new_server_channel) > 0:
server_channel = new_server_channel
# Determine new version(s)