diff options
author | Armin Weatherwax | 2010-05-04 16:47:17 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-05-04 16:47:17 +0200 |
commit | a5b7203dbdaac2c41a2a40bbd45a7050dfb96f5b (patch) | |
tree | 0b6d007572098c5bd8558886822eda5d2b010a7b /linden/indra/newview/llappviewerlinux.cpp | |
parent | update Linux (32 and 64bit) OpenAL to 1.11.753 (diff) | |
download | meta-impy-a5b7203dbdaac2c41a2a40bbd45a7050dfb96f5b.zip meta-impy-a5b7203dbdaac2c41a2a40bbd45a7050dfb96f5b.tar.gz meta-impy-a5b7203dbdaac2c41a2a40bbd45a7050dfb96f5b.tar.bz2 meta-impy-a5b7203dbdaac2c41a2a40bbd45a7050dfb96f5b.tar.xz |
replace ambiguous NULL pointers for g_object.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llappviewerlinux.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp index a844f81..4372053 100644 --- a/linden/indra/newview/llappviewerlinux.cpp +++ b/linden/indra/newview/llappviewerlinux.cpp | |||
@@ -464,8 +464,15 @@ bool LLAppViewerLinux::initSLURLHandler() | |||
464 | LL_DEBUGS("DBUS")<< "Debug DBUS Start"<< LL_ENDL; | 464 | LL_DEBUGS("DBUS")<< "Debug DBUS Start"<< LL_ENDL; |
465 | 465 | ||
466 | //ViewerAppAPI *api_server = (ViewerAppAPI*) | 466 | //ViewerAppAPI *api_server = (ViewerAppAPI*) |
467 | g_object_new(viewerappapi_get_type(), NULL); | ||
468 | 467 | ||
468 | g_object_new(viewerappapi_get_type(), NULL, (void*)NULL); | ||
469 | /// also possible instead: | ||
470 | /* GType obj_type = viewerappapi_get_type(); | ||
471 | g_object_newv(obj_type, 0, NULL); //gpointer g_object_newv (GType object_type, | ||
472 | // guint n_parameters, | ||
473 | // GParameter *parameters); | ||
474 | |||
475 | */ | ||
469 | return true; | 476 | return true; |
470 | } | 477 | } |
471 | 478 | ||