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

when estate_settings.xml is empty or missing

1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 9fdb046..fc3bf23 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -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;
                 }
             }