Applied patch by Robin Cornelius for VWR-11128 - Python not always detected by develop.py

2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 29c5066..2ed9c6e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2009-09-15 McCabe Maxsted  <hakushakukun@gmail.com>
+
+     * Applied patch by Robin Cornelius for VWR-11128 - Python not always detected by develop.py.
+
+                modified:   linden/indra/cmake/Python.cmake
+                
+
 2009-09-14 McCabe Maxsted  <hakushakukun@gmail.com>
 
      * Small improvement to hide selection outlines in LLSelectMgr.
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index 4f86d32..0901c1b 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -13,6 +13,10 @@ if (WINDOWS)
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
     )
 elseif (EXISTS /etc/debian_version)
   # On Debian and Ubuntu, avoid Python 2.4 if possible.