diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llapp.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/lluuid.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index d3bd438872..f8a593c33d 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -189,6 +189,8 @@ public: #if !LL_WINDOWS static U32 getSigChildCount(); static void incSigChildCount(); +#else +#define getpid GetCurrentProcessId #endif static int getPid(); diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp index 3fd0d042b9..bcbae06ec5 100644 --- a/indra/llcommon/lluuid.cpp +++ b/indra/llcommon/lluuid.cpp @@ -209,7 +209,7 @@ std::string LLUUID::asString() const BOOL LLUUID::set(const char* in_string, BOOL emit) { - return set(ll_safe_string(in_string)); + return set(ll_safe_string(in_string),emit); } BOOL LLUUID::set(const std::string& in_string, BOOL emit) @@ -231,7 +231,7 @@ BOOL LLUUID::set(const std::string& in_string, BOOL emit) { if(emit) { - llinfos << "Warning! Using broken UUID string format" << llendl; + llwarns << "Warning! Using broken UUID string format" << llendl; } broken_format = TRUE; } @@ -240,7 +240,8 @@ BOOL LLUUID::set(const std::string& in_string, BOOL emit) // Bad UUID string. Spam as INFO, as most cases we don't care. if(emit) { - llinfos << "Bad UUID string: " << in_string << llendl; + //don't spam the logs because a resident can't spell. + llwarns << "Bad UUID string: " << in_string << llendl; } setNull(); return FALSE; |