diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 48d02dfeaa..28fdf147c9 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -225,7 +225,10 @@ void viewerappapi_init(ViewerAppAPI *server) } } -gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error) +// FIRE-5417; The xml manifest for dbus claims success_rtn is a boolean, not a boolean array +//gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error) +gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean *success_rtn, GError **error) +// { bool success = false; @@ -242,8 +245,14 @@ gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **succ success = true; } - *success_rtn = g_new (gboolean, 1); - (*success_rtn)[0] = (gboolean)success; + // FIRE-5417; The xml manifest for dbus claims success_rtn is a boolean, not a boolean array + + // *success_rtn = g_new (gboolean, 1); + // (*success_rtn)[0] = (gboolean)success; + + *success_rtn = (gboolean)success; + + // return TRUE; // the invokation succeeded, even if the actual dispatch didn't. } diff --git a/indra/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h index 58e5160180..2360171c73 100644 --- a/indra/newview/llappviewerlinux.h +++ b/indra/newview/llappviewerlinux.h @@ -78,7 +78,12 @@ typedef struct } ViewerAppAPI; extern "C" { - gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error); + // FIRE-5417; The xml manifest for dbus claims success_rtn is a boolean, not a boolean array + + // gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error); + gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean *success_rtn, GError **error); + + // } #define VIEWERAPI_SERVICE "com.secondlife.ViewerAppAPIService"