diff options
| author | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
| commit | a1041a6fa17368e13d610df9d5eb23e307654815 (patch) | |
| tree | 5f8c22e1bbdeb727600c31ff60f908b785c2faae /linden/indra/develop.py | |
| parent | Moved "Show HUD Attachments" back to View, restored shortcut. (diff) | |
| parent | Fixed region names not showing up on regions with zero avatars (diff) | |
| download | meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.zip meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.gz meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.bz2 meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to 'linden/indra/develop.py')
| -rwxr-xr-x | linden/indra/develop.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 207a48b..85837ba 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py | |||
| @@ -536,7 +536,7 @@ class WindowsSetup(PlatformSetup): | |||
| 536 | gen = gen.lower() | 536 | gen = gen.lower() |
| 537 | try: | 537 | try: |
| 538 | import _winreg | 538 | import _winreg |
| 539 | key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s\Setup\VC' % | 539 | key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' % |
| 540 | self.gens[gen]['ver']) | 540 | self.gens[gen]['ver']) |
| 541 | value_str = (r'ProductDir') | 541 | value_str = (r'ProductDir') |
| 542 | print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' % | 542 | print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' % |