diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-05-22 22:08:54 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-05-22 22:08:54 +0000 |
| commit | 060c728970dc78d30f2cebdbeda7e56ea8de46e2 (patch) | |
| tree | 8f00ce1b3bd564bc6cb81a2bc39a081eb3deca35 /indra/newview/llappviewerlinux_api_dbus.cpp | |
| parent | f8874d04b8ca238ee99dc464055295cff417a9b2 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Merge. Pull in viewer-release after release of 3.7.8
Diffstat (limited to 'indra/newview/llappviewerlinux_api_dbus.cpp')
| -rwxr-xr-x | indra/newview/llappviewerlinux_api_dbus.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewerlinux_api_dbus.cpp b/indra/newview/llappviewerlinux_api_dbus.cpp index 32e7e0a83d..6ac30bd9b8 100755 --- a/indra/newview/llappviewerlinux_api_dbus.cpp +++ b/indra/newview/llappviewerlinux_api_dbus.cpp @@ -35,9 +35,9 @@ extern "C" { #include "apr_dso.h" } -#define DEBUGMSG(...) do { lldebugs << llformat(__VA_ARGS__) << llendl; } while(0) -#define INFOMSG(...) do { llinfos << llformat(__VA_ARGS__) << llendl; } while(0) -#define WARNMSG(...) do { llwarns << llformat(__VA_ARGS__) << llendl; } while(0) +#define DEBUGMSG(...) do { LL_DEBUGS() << llformat(__VA_ARGS__) << LL_ENDL; } while(0) +#define INFOMSG(...) do { LL_INFOS() << llformat(__VA_ARGS__) << LL_ENDL; } while(0) +#define WARNMSG(...) do { LL_WARNS() << llformat(__VA_ARGS__) << LL_ENDL; } while(0) #define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) RTN (*ll##DBUSSYM)(__VA_ARGS__) = NULL #include "llappviewerlinux_api_dbus_syms_raw.inc" |