diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-22 08:55:49 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-22 08:55:49 -0700 |
| commit | 63be74f57c5a520e308a90d44e58ae5e5ba2e6bf (patch) | |
| tree | dd3f93d06ba1105dae4fc910f4ae8601a792d4b1 /indra/media_plugins/webkit/linux_volume_catcher.cpp | |
| parent | 27a419de2a7f9b1c2cae54d9e8fb3297567bbb8a (diff) | |
| parent | a42cf03807385c214118298821d532f5b6b4d984 (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/media_plugins/webkit/linux_volume_catcher.cpp')
| -rw-r--r-- | indra/media_plugins/webkit/linux_volume_catcher.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp index 2e7fda865e..5eaef0e1c3 100644 --- a/indra/media_plugins/webkit/linux_volume_catcher.cpp +++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp @@ -47,6 +47,7 @@ extern "C" { #include <glib.h> +#include <glib-object.h> #include <pulse/introspect.h> #include <pulse/context.h> @@ -220,6 +221,10 @@ void VolumeCatcherImpl::init() mGotSyms = loadsyms("libpulse-mainloop-glib.so.0"); if (!mGotSyms) return; + // better make double-sure glib itself is initialized properly. + if (!g_thread_supported ()) g_thread_init (NULL); + g_type_init(); + mMainloop = llpa_glib_mainloop_new(g_main_context_default()); if (mMainloop) { |