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, 58 insertions, 0 deletions

diff --git a/linden/indra/newview/build_win32_appConfig.py b/linden/indra/newview/build_win32_appConfig.py
new file mode 100644
index 0000000..fb6a025
--- /dev/null
+++ b/linden/indra/newview/build_win32_appConfig.py
@@ -0,0 +1,58 @@
+# @file build_win32_appConfig.py
+# @brief Create the windows app.config file to redirect crt linkage.
+#
+# $LicenseInfo:firstyear=2009&license=viewergpl$
+# 
+# Copyright (c) 2009, Linden Research, Inc.
+# 
+# Second Life Viewer Source Code
+# The source code in this file ("Source Code") is provided by Linden Lab
+# to you under the terms of the GNU General Public License, version 2.0
+# ("GPL"), unless you have obtained a separate licensing agreement
+# ("Other License"), formally executed by you and Linden Lab.  Terms of
+# the GPL can be found in doc/GPL-license.txt in this distribution, or
+# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+# 
+# There are special exceptions to the terms and conditions of the GPL as
+# it is applied to this Source Code. View the full text of the exception
+# in the file doc/FLOSS-exception.txt in this software distribution, or
+# online at
+# http://secondlifegrid.net/programs/open_source/licensing/flossexception
+# 
+# By copying, modifying or distributing this software, you acknowledge
+# that you have read and understood your obligations described above,
+# and agree to abide by those obligations.
+# 
+# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+# COMPLETENESS OR PERFORMANCE.
+# $/LicenseInfo$
+
+import sys, os, re
+from xml.dom.minidom import parse
+
+def main():
+    src_manifest_name = sys.argv[1]
+    src_config_name = sys.argv[2]
+    dst_config_name = sys.argv[3]
+ 
+    manifest_dom = parse(src_manifest_name)
+    node = manifest_dom.getElementsByTagName('assemblyIdentity')[0]
+    manifest_assm_ver = node.getAttribute('version')
+    
+    config_dom = parse(src_config_name)
+    node = config_dom.getElementsByTagName('bindingRedirect')[0]
+    node.setAttribute('newVersion', manifest_assm_ver)
+    src_old_ver = re.match('([^-]*-).*', node.getAttribute('oldVersion')).group(1)
+    node.setAttribute('oldVersion', src_old_ver + manifest_assm_ver)
+    comment = config_dom.createComment("This file is automatically generated by the build. see indra/newview/build_win32_appConfig.py")
+    config_dom.insertBefore(comment, config_dom.childNodes[0])
+    
+    f = open(dst_config_name, 'w')
+    config_dom.writexml(f)
+    f.close()
+        
+    return 0
+
+if __name__ == "__main__":
+    main()