From cc72ea532a5ad6d075a7ed2b017428fbecbb54b5 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 12 Oct 2008 16:40:18 +0000 Subject: [PATCH] Fix linking phantom and nonphantom prims. Make the error message more friendly when estate_settings.xml is empty or missing --- OpenSim/Framework/ConfigurationMember.cs | 6 +++++- OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs index 9fdb0468f2..fc3bf23792 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; } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 27601d271e..bf6025ef28 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -553,7 +553,7 @@ namespace OpenSim.Region.Environment.Scenes if (ParentGroup != null && ParentGroup.RootPart != null) { - if (_parentID != 0) + if (_parentID != 0 && PhysActor != null) { Vector3 resultingposition = GetWorldPosition(); PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z);