From 549cc042ce6e5cc507cd9a7b98c03ab2d9aa768a Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 15 Sep 2009 01:49:46 -0700 Subject: Applied patch by Robin Cornelius for VWR-11128 - Python not always detected by develop.py --- ChangeLog.txt | 7 +++++++ linden/indra/cmake/Python.cmake | 4 ++++ 2 files changed, 11 insertions(+) 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 + + * 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 * 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. -- cgit v1.1