From abcc37e4ca6e8a4020f4d53e9692fe8a856ca306 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 7 Jul 2009 18:08:15 -0700 Subject: Oops, forgot to update the plugin loading code when I switched ll_plugin_start to take LLSD arguments. --- indra/newview/llappviewer.cpp | 10 ++++------ 1 file 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(listen_port); - std::vector 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); } -- cgit v1.2.3