Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-25 20:26:48 +01:00
6 changed files with 45 additions and 25 deletions

View File

@@ -310,7 +310,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
catch (Exception e)
{
m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed with "), e);
m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
}
}