diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-07-07 18:08:15 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-07 18:08:15 -0700 |
commit | abcc37e4ca6e8a4020f4d53e9692fe8a856ca306 (patch) | |
tree | 91055735b1f560f975373654893cbf4a7452dd01 /indra/newview/llappviewer.cpp | |
parent | 31cdebe2010a43d9158aec236cc3f5275819352c (diff) |
Oops, forgot to update the plugin loading code when I switched ll_plugin_start to take LLSD arguments.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 745e433f3c..bed63c4dbc 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4122,16 +4122,14 @@ void LLAppViewer::loadEventHostModule(S32 listen_port) const ll_apr_assert_status(rv); llassert_always(eventhost_dso_handle != NULL); - int (*ll_plugin_start_func)(char const * const *, char const * const *) = NULL; + int (*ll_plugin_start_func)(LLSD const &) = NULL; rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll_plugin_start_func, eventhost_dso_handle, "ll_plugin_start"); ll_apr_assert_status(rv); llassert_always(ll_plugin_start_func != NULL); - std::string port_text = boost::lexical_cast<std::string>(listen_port); - std::vector<char const *> args; - args.push_back("-L"); - args.push_back(port_text.c_str()); + LLSD args; + args["listen_port"] = listen_port; - ll_plugin_start_func(&args[0], &args[0] + args.size()); + ll_plugin_start_func(args); } |