diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/copy_win_scripts/start-client.py | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to 'linden/indra/copy_win_scripts/start-client.py')
| -rwxr-xr-x[-rw-r--r--] | linden/indra/copy_win_scripts/start-client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/copy_win_scripts/start-client.py b/linden/indra/copy_win_scripts/start-client.py index 5f7ff2f..ea2b67a 100644..100755 --- a/linden/indra/copy_win_scripts/start-client.py +++ b/linden/indra/copy_win_scripts/start-client.py | |||
| @@ -32,7 +32,7 @@ def start_client(grid, slurl, build_config, my_args): | |||
| 32 | f = open("start-client.log", "w") | 32 | f = open("start-client.log", "w") |
| 33 | print >>f, "Viewer startup arguments:" | 33 | print >>f, "Viewer startup arguments:" |
| 34 | llstart.start("viewer", "../../newview", | 34 | llstart.start("viewer", "../../newview", |
| 35 | "%s/newview/%s/secondlife-bin.exe" % (build_path, build_config), | 35 | "%s/newview/%s/imprudence-bin.exe" % (build_path, build_config), |
| 36 | viewer_args, f) | 36 | viewer_args, f) |
| 37 | f.close() | 37 | f.close() |
| 38 | 38 | ||