aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/lib
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/lib')
-rw-r--r--linden/indra/lib/python/indra/util/llversion.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/lib/python/indra/util/llversion.py b/linden/indra/lib/python/indra/util/llversion.py
index 0e59c17..aedb947 100644
--- a/linden/indra/lib/python/indra/util/llversion.py
+++ b/linden/indra/lib/python/indra/util/llversion.py
@@ -43,7 +43,7 @@ def get_version_file_contents(version_type):
43 file.close() 43 file.close()
44 return file_str 44 return file_str
45 45
46def get_version(version_type): 46def get_version(version_type, revision=0):
47 file_str = get_version_file_contents(version_type) 47 file_str = get_version_file_contents(version_type)
48 m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', file_str) 48 m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', file_str)
49 VER_MAJOR = m.group(1) 49 VER_MAJOR = m.group(1)
@@ -61,11 +61,11 @@ def get_channel(version_type):
61 m = re.search('const char \* const LL_CHANNEL = "(.+)";', file_str) 61 m = re.search('const char \* const LL_CHANNEL = "(.+)";', file_str)
62 return m.group(1) 62 return m.group(1)
63 63
64def get_viewer_version(): 64def get_viewer_version(revision=0):
65 return get_version('viewer') 65 return get_version('viewer', revision)
66 66
67def get_server_version(): 67def get_server_version(revision=0):
68 return get_version('server') 68 return get_version('server', revision)
69 69
70def get_viewer_channel(): 70def get_viewer_channel():
71 return get_channel('viewer') 71 return get_channel('viewer')