summaryrefslogtreecommitdiff
path: root/indra/viewer_components/updater
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-01-21 11:45:15 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-01-21 11:45:15 -0500
commit47d94757075e338c480ba4d7d24948242a85a9bb (patch)
tree5f21b275e7f8ec551428d79087fe928d9f359a4f /indra/viewer_components/updater
parent6e214960ce203d1d50d7bd6bd04eedee3afd0fa3 (diff)
Convert LLProcess consumers from LLSD to LLProcess::Params block.
Using a Params block gives compile-time checking against attribute typos. One might inadvertently set myLLSD["autofill"] = false and only discover it when things behave strangely at runtime; but trying to set myParams.autofill will produce a compile error. However, it's excellent that the same LLProcess::create() method can accept either LLProcess::Params or a properly-constructed LLSD block.
Diffstat (limited to 'indra/viewer_components/updater')
-rw-r--r--indra/viewer_components/updater/llupdateinstaller.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp
index e99fd0af7e..2f87d59373 100644
--- a/indra/viewer_components/updater/llupdateinstaller.cpp
+++ b/indra/viewer_components/updater/llupdateinstaller.cpp
@@ -78,12 +78,12 @@ int ll_install_update(std::string const & script,
llinfos << "UpdateInstaller: installing " << updatePath << " using " <<
actualScriptPath << LL_ENDL;
- LLSD params;
- params["executable"] = actualScriptPath;
- params["args"].append(updatePath);
- params["args"].append(ll_install_failed_marker_path());
- params["args"].append(boost::lexical_cast<std::string>(required));
- params["autokill"] = false;
+ LLProcess::Params params;
+ params.executable = actualScriptPath;
+ params.args.add(updatePath);
+ params.args.add(ll_install_failed_marker_path());
+ params.args.add(boost::lexical_cast<std::string>(required));
+ params.autokill = false;
return LLProcess::create(params)? 0 : -1;
}