summaryrefslogtreecommitdiff
path: root/indra/lib
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-29 18:00:26 -0500
committerDave Parks <davep@lindenlab.com>2022-06-29 18:00:26 -0500
commit56ae3e0a083aefcbd6d7c955bb2c7e9e58000a4b (patch)
tree53ad2998536760442a00b1d239a7223e864ba3c9 /indra/lib
parentfd6b5ea8c3df7e8b4b648ac7ecc9f30eedd4b7c0 (diff)
parent36fd0f7ca932cce5cd3614c16cd26aceedf57952 (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/lib')
-rwxr-xr-xindra/lib/python/indra/util/llmanifest.py3
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'