diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
| commit | a3066b7375a13b61861b554519673dfc24322c22 (patch) | |
| tree | 9b3d61c932ff8a88e5a2384f138e7ed9b83248ac /indra/llcommon/tests/llsdserialize_test.cpp | |
| parent | f1e52656e9e328d66aa5050bc9e59948a0217283 (diff) | |
| parent | 124d8c8dce3a5da8aa73f12f8733c65f57479a24 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/tests/llsdserialize_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/llsdserialize_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index 81b930e1e2..8836230640 100644 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -1553,7 +1553,7 @@ namespace tut params.executable = PYTHON; params.args.add(scriptfile.getName()); LLProcessPtr py(LLProcess::create(params)); - ensure(STRINGIZE("Couldn't launch " << desc << " script"), py); + ensure(STRINGIZE("Couldn't launch " << desc << " script"), bool(py)); // Implementing timeout would mean messing with alarm() and // catching SIGALRM... later maybe... int status(0); |