Merged SL 1.23.5 into Imprudence.

Conflicts:
	linden/indra/cmake/CopyWinLibs.cmake
	linden/indra/lib/python/indra/util/llversion.py
	linden/indra/llcommon/llversionviewer.h
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/llassetuploadresponders.cpp
	linden/indra/newview/llpreview.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/viewer_manifest.py

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):
     file.close()
     return file_str
 
-def get_version(version_type):
+def get_version(version_type, revision=0):
     file_str = get_version_file_contents(version_type)
     m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', file_str)
     VER_MAJOR = m.group(1)
@@ -61,11 +61,11 @@ def get_channel(version_type):
     m = re.search('const char \* const LL_CHANNEL = "(.+)";', file_str)
     return m.group(1)
     
-def get_viewer_version():
-    return get_version('viewer')
+def get_viewer_version(revision=0):
+    return get_version('viewer', revision)
 
-def get_server_version():
-    return get_version('server')
+def get_server_version(revision=0):
+    return get_version('server', revision)
 
 def get_viewer_channel():
     return get_channel('viewer')