fix merge

This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
960 changed files with 23754 additions and 23741 deletions

View File

@@ -492,7 +492,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 {3}",
poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", e);
}
}