fix merge

This commit is contained in:
UbitUmarov
2017-05-03 03:52:55 +01:00
31 changed files with 1083 additions and 245 deletions

View File

@@ -191,8 +191,7 @@ namespace OpenSim.Framework.Servers
}
catch(Exception e)
{
m_log.FatalFormat("Fatal error: {0}",
(e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message );
m_log.Fatal("Fatal error: " + e.ToString());
Environment.Exit(1);
}