summaryrefslogtreecommitdiff
path: root/indra/copy_win_scripts
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-05-13 17:06:17 +0300
committerGitHub <noreply@github.com>2024-05-13 17:06:17 +0300
commit9013267da2269a9bd9683862b7449db1b1093afc (patch)
tree336172dfd6468e8bafa1d9c4a229624e85ffecfb /indra/copy_win_scripts
parent0cb2c511bc2a0f54eb7b3a4c2988d7ebec96e3be (diff)
parent38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (diff)
Merge pull request #1373 from secondlife/marchcat/x-ws-merge
Diffstat (limited to 'indra/copy_win_scripts')
-rwxr-xr-xindra/copy_win_scripts/start-client.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/copy_win_scripts/start-client.py b/indra/copy_win_scripts/start-client.py
index 6e5628c211..c6f045349b 100755
--- a/indra/copy_win_scripts/start-client.py
+++ b/indra/copy_win_scripts/start-client.py
@@ -29,7 +29,7 @@ import llstart
def usage():
print("""start-client.py
-
+
--grid <grid>
--farm <grid>
--region <starting region name>
@@ -52,20 +52,20 @@ def start_client(grid, slurl, build_config, my_args):
# Figure out path stuff.
# The client should run from indra/newview
# but the exe is at indra/build-<xxx>/newview/<target>
- build_path = os.path.dirname(os.getcwd());
+ build_path = os.path.dirname(os.getcwd());
f = open("start-client.log", "w")
print("Viewer startup arguments:", file=f)
- llstart.start("viewer", "../../newview",
+ llstart.start("viewer", "../../newview",
"%s/newview/%s/secondlife-bin.exe" % (build_path, build_config),
viewer_args, f)
f.close()
if __name__ == "__main__":
grid = llstart.get_config("grid")
-
+
if grid == None:
grid = "aditi"
-
+
build_config = llstart.get_config("build_config")
my_args = llstart.get_config("viewer_args", force_dict = True)
opts, args = getopt.getopt(sys.argv[1:], "u:r:f:g:i:h",
@@ -79,8 +79,8 @@ if __name__ == "__main__":
if o in ("-h", "--help"):
usage()
sys.exit(0)
-
- slurl = llstart.get_config("slurl")
+
+ slurl = llstart.get_config("slurl")
if slurl == None:
if region is None:
region = llstart.get_user_name()
@@ -88,5 +88,5 @@ if __name__ == "__main__":
# Ensure the slurl has quotes around it.
if slurl is not None:
slurl = '"%s"' % (slurl.strip('"\''))
-
+
start_client(grid, slurl, build_config, my_args)