aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-12 16:40:18 +0000
committerMelanie Thielker2008-10-12 16:40:18 +0000
commitcc72ea532a5ad6d075a7ed2b017428fbecbb54b5 (patch)
treeade6e6d25ac7ab31c24fcd1262889325f573f5b3 /OpenSim
parentAdd EventInfoRequest and EventInfoReply packets. (diff)
downloadopensim-SC_OLD-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.zip
opensim-SC_OLD-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.tar.gz
opensim-SC_OLD-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.tar.bz2
opensim-SC_OLD-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.tar.xz
Fix linking phantom and nonphantom prims. Make the error message more friendly
when estate_settings.xml is empty or missing
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
2 files changed, 6 insertions, 2 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
206 } 206 }
207 catch (XmlException e) 207 catch (XmlException e)
208 { 208 {
209 m_log.Error("Error loading " + configurationFilename + ": " + e.ToString()); 209 {
210 m_log.WarnFormat("[CONFIG] Not using {0}: {1}",
211 configurationFilename,
212 e.Message.ToString());
213 //m_log.Error("Error loading " + configurationFilename + ": " + e.ToString());
210 useFile = false; 214 useFile = false;
211 } 215 }
212 } 216 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 27601d2..bf6025e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -553,7 +553,7 @@ namespace OpenSim.Region.Environment.Scenes
553 553
554 if (ParentGroup != null && ParentGroup.RootPart != null) 554 if (ParentGroup != null && ParentGroup.RootPart != null)
555 { 555 {
556 if (_parentID != 0) 556 if (_parentID != 0 && PhysActor != null)
557 { 557 {
558 Vector3 resultingposition = GetWorldPosition(); 558 Vector3 resultingposition = GetWorldPosition();
559 PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z); 559 PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z);