diff options
Diffstat (limited to '')
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/cmake/Python.cmake | 4 |
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 @@ | |||
1 | 2009-09-15 McCabe Maxsted <hakushakukun@gmail.com> | ||
2 | |||
3 | * Applied patch by Robin Cornelius for VWR-11128 - Python not always detected by develop.py. | ||
4 | |||
5 | modified: linden/indra/cmake/Python.cmake | ||
6 | |||
7 | |||
1 | 2009-09-14 McCabe Maxsted <hakushakukun@gmail.com> | 8 | 2009-09-14 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 9 | ||
3 | * Small improvement to hide selection outlines in LLSelectMgr. | 10 | * 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) | |||
13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] | 13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] | 14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |
15 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] | 15 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] |
16 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] | ||
17 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] | ||
18 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] | ||
19 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] | ||
16 | ) | 20 | ) |
17 | elseif (EXISTS /etc/debian_version) | 21 | elseif (EXISTS /etc/debian_version) |
18 | # On Debian and Ubuntu, avoid Python 2.4 if possible. | 22 | # On Debian and Ubuntu, avoid Python 2.4 if possible. |