diff options
| author | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
| commit | 6c953d0bde107059db75d01cd30326a31cd0de54 (patch) | |
| tree | c41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/llmessage | |
| parent | bdd7bdf390775860fb26a6c7d0923f45bb20256c (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 2 | ||||
| -rw-r--r-- | indra/llmessage/llcorehttputil.cpp | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 5a112b5432..abe0e46e5d 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -769,7 +769,7 @@ LLUUID LLAvatarNameCache::findIdByName(const std::string& name) // Legacy method LLUUID id; - if (gCacheName->getUUID(name, id)) + if (gCacheName && gCacheName->getUUID(name, id)) { return id; } diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp index ac4b1310a4..24387fbffd 100644 --- a/indra/llmessage/llcorehttputil.cpp +++ b/indra/llmessage/llcorehttputil.cpp @@ -84,7 +84,7 @@ void logMessageSuccess(std::string logAuth, std::string url, std::string message void logMessageFail(std::string logAuth, std::string url, std::string message) { - LL_WARNS("CoreHTTP") << logAuth << " Failure '" << message << "' for " << url << LL_ENDL; + LL_INFOS("CoreHTTP") << logAuth << " Possible failure '" << message << "' for " << url << LL_ENDL; } //========================================================================= @@ -279,10 +279,11 @@ void HttpCoroHandler::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRespons result = LLSD::emptyMap(); LLCore::HttpStatus::type_enum_t errType = status.getType(); - LL_WARNS("CoreHTTP") - << " Error[" << status.toTerseString() << "] cannot "<< response->getRequestMethod() - << " to url '" << response->getRequestURL() - << "' because " << status.toString() << LL_ENDL; + LL_INFOS() + << "Possible failure [" << status.toTerseString() << "] cannot "<< response->getRequestMethod() + << " url '" << response->getRequestURL() + << "' because " << status.toString() + << LL_ENDL; if ((errType >= 400) && (errType < 500)) { LLSD body = this->parseBody(response, parseSuccess); |