diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-07-12 00:42:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-07-12 00:42:54 +0300 |
| commit | 43de9f202e9c09bc46e9b4e51ac87425b99b9a55 (patch) | |
| tree | 99ea03d6f0af12135b4a428ec0b7c595a7d3ee9f /indra/lib | |
| parent | 3f98411c56f4daa06c9102346a8dd37af18d2cb6 (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' into DRTVWR-528
# Conflicts:
# indra/newview/llappviewer.cpp
Diffstat (limited to 'indra/lib')
| -rwxr-xr-x | indra/lib/python/indra/util/llmanifest.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index aedd3b7ee4..5b277846b7 100755 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -83,8 +83,7 @@ def proper_windows_path(path, current_platform = sys.platform): return drive_letter.upper() + ':\\' + rel.replace('/', '\\') def get_default_platform(dummy): - return {'linux2':'linux', - 'linux1':'linux', + return {'linux':'linux', 'cygwin':'windows', 'win32':'windows', 'darwin':'darwin' |