Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
7c286302
Commit
7c286302
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Convert start-client to py3
parent
ee57633e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/copy_win_scripts/start-client.py
+5
-5
5 additions, 5 deletions
indra/copy_win_scripts/start-client.py
with
5 additions
and
5 deletions
indra/copy_win_scripts/start-client.py
+
5
−
5
View file @
7c286302
#!/usr/bin/env python
2
#!/usr/bin/env python
3
"""
\
@file start-client.py
...
...
@@ -28,12 +28,12 @@
import
llstart
def
usage
():
print
"""
start-client.py
print
(
"""
start-client.py
--grid <grid>
--farm <grid>
--region <starting region name>
"""
"""
)
def
start_client
(
grid
,
slurl
,
build_config
,
my_args
):
login_url
=
"
https://login.%s.lindenlab.com/cgi-bin/login.cgi
"
%
(
grid
)
...
...
@@ -42,7 +42,7 @@ def start_client(grid, slurl, build_config, my_args):
"
--loginuri
"
:
login_url
}
viewer_args
.
update
(
my_args
)
# *sigh* We must put --url at the end of the argument list.
if
viewer_args
.
has_key
(
"
--url
"
)
:
if
"
--url
"
in
viewer_args
:
slurl
=
viewer_args
[
"
--url
"
]
del
(
viewer_args
[
"
--url
"
])
viewer_args
=
llstart
.
get_args_from_dict
(
viewer_args
)
...
...
@@ -54,7 +54,7 @@ def start_client(grid, slurl, build_config, my_args):
# but the exe is at indra/build-<xxx>/newview/<target>
build_path
=
os
.
path
.
dirname
(
os
.
getcwd
());
f
=
open
(
"
start-client.log
"
,
"
w
"
)
print
>>
f
,
"
Viewer startup arguments:
"
print
(
"
Viewer startup arguments:
"
,
file
=
f
)
llstart
.
start
(
"
viewer
"
,
"
../../newview
"
,
"
%s/newview/%s/alchemy-bin.exe
"
%
(
build_path
,
build_config
),
viewer_args
,
f
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment