Fix linking phantom and nonphantom prims. Make the error message more friendly

when estate_settings.xml is empty or missing
This commit is contained in:
Melanie Thielker
2008-10-12 16:40:18 +00:00
parent f52c5febd3
commit cc72ea532a
2 changed files with 6 additions and 2 deletions

View File

@@ -206,7 +206,11 @@ namespace OpenSim.Framework
}
catch (XmlException e)
{
m_log.Error("Error loading " + configurationFilename + ": " + e.ToString());
{
m_log.WarnFormat("[CONFIG] Not using {0}: {1}",
configurationFilename,
e.Message.ToString());
//m_log.Error("Error loading " + configurationFilename + ": " + e.ToString());
useFile = false;
}
}