summaryrefslogtreecommitdiff
path: root/indra/lib/python
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2022-06-29 14:00:50 -0700
committerPtolemy <ptolemy@lindenlab.com>2022-06-29 14:00:50 -0700
commit36fd0f7ca932cce5cd3614c16cd26aceedf57952 (patch)
treeada1b461d97bf75b016a13bbc30c070ee74a1183 /indra/lib/python
parent78e3edba6e998d8e97a1bff952073f62e58fd379 (diff)
parent069304ca394d4d6069f00bb976f2d75e82bf675c (diff)
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/lib/python')
-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'