Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2017-08-16 05:05:57 +01:00
36 changed files with 786 additions and 508 deletions

View File

@@ -491,7 +491,7 @@ namespace OpenSim.Region.ClientStack.Linden
catch (Exception e)
{
m_log.ErrorFormat(
"[INVENTORY]: Failed to process queued inventory request {0} for {1}. Exception {3}",
"[INVENTORY]: Failed to process queued inventory request {0} for {1}. Exception {2}",
poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", e);
}
}