From 7ed9c85a1a28e494adbd2cef85b186e45dba2dc2 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 15 Aug 2016 14:48:09 -0700 Subject: SL-323: fixes to Tkinter race condition, post --channel and --settings testing, contains debugging statements to be removed after all testing complete --- indra/viewer_components/manager/SL_Launcher | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/viewer_components/manager/SL_Launcher') diff --git a/indra/viewer_components/manager/SL_Launcher b/indra/viewer_components/manager/SL_Launcher index 0403e01cec..8da8dc236b 100755 --- a/indra/viewer_components/manager/SL_Launcher +++ b/indra/viewer_components/manager/SL_Launcher @@ -31,7 +31,12 @@ import InstallerUserMessage #NOTA BENE: # For POSIX platforms, llsd.py will be imported from the same directory. # For Windows, llsd.py will be compiled into the executable by pyinstaller -from llbase import llsd +try: + from llbase import llsd +except: + #if Windows, this is expected, if not, we're dead + if os.name == 'nt': + pass import platform import subprocess import update_manager @@ -158,6 +163,7 @@ args = parser.parse_known_args(sys.argv) #args[1] looks like ['./SL_Launcher', '--set', 'foo', 'bar', '-X', '-Y', 'qux'], dump the progname args_list_to_pass = args[1][1:] vmp_args = capture_vmp_args(args_list_to_pass) +print "vmp args: " + repr(vmp_args) #make a copy by value, not by reference command = list(args_list_to_pass) -- cgit v1.3