OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

when estate_settings.xml is empty or missing
0.6.0-stable
Melanie Thielker 2008-10-12 16:40:18 +00:00
parent f52c5febd3
commit cc72ea532a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/ConfigurationMember.cs
View File

@ -206,7 +206,11 @@ namespace OpenSim.Framework
} }
catch (XmlException e) 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; useFile = false;
} }
} }

2
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -553,7 +553,7 @@ namespace OpenSim.Region.Environment.Scenes
if (ParentGroup != null && ParentGroup.RootPart != null) if (ParentGroup != null && ParentGroup.RootPart != null)
{ {
if (_parentID != 0) if (_parentID != 0 && PhysActor != null)
{ {
Vector3 resultingposition = GetWorldPosition(); Vector3 resultingposition = GetWorldPosition();
PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z); PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z);