aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-12 22:44:14 +0100
committerJustin Clark-Casey (justincc)2011-09-12 22:44:14 +0100
commit00f8946bd420a796128e58f025f7f380887306ab (patch)
tree588946f5f3e4f3725c0b5b36765f2a17f6840671
parentcomment out some recent terrain texture logging (diff)
downloadopensim-SC_OLD-00f8946bd420a796128e58f025f7f380887306ab.zip
opensim-SC_OLD-00f8946bd420a796128e58f025f7f380887306ab.tar.gz
opensim-SC_OLD-00f8946bd420a796128e58f025f7f380887306ab.tar.bz2
opensim-SC_OLD-00f8946bd420a796128e58f025f7f380887306ab.tar.xz
minor: if the script engine fails to find a prim for a script, also print out that prim's local id in the error message.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 6f963ac..89e6ddb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -418,6 +418,10 @@ namespace OpenSim.Region.Framework.Scenes
418 418
419 lock (SceneObjectGroupsByLocalPartID) 419 lock (SceneObjectGroupsByLocalPartID)
420 { 420 {
421// m_log.DebugFormat(
422// "[SCENE GRAPH]: Adding scene object {0} {1} {2} to SceneObjectGroupsByLocalPartID in {3}",
423// sceneObject.Name, sceneObject.UUID, sceneObject.LocalId, m_parentScene.RegionInfo.RegionName);
424
421 SceneObjectGroupsByLocalPartID[sceneObject.LocalId] = sceneObject; 425 SceneObjectGroupsByLocalPartID[sceneObject.LocalId] = sceneObject;
422 foreach (SceneObjectPart part in children) 426 foreach (SceneObjectPart part in children)
423 SceneObjectGroupsByLocalPartID[part.LocalId] = sceneObject; 427 SceneObjectGroupsByLocalPartID[part.LocalId] = sceneObject;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 55f373e..156fd57 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -594,7 +594,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
594 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); 594 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
595 if (part == null) 595 if (part == null)
596 { 596 {
597 m_log.Error("[Script] SceneObjectPart unavailable. Script NOT started."); 597 m_log.ErrorFormat("[Script]: SceneObjectPart with localID {0} unavailable. Script NOT started.", localID);
598 m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n"; 598 m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
599 m_ScriptFailCount++; 599 m_ScriptFailCount++;
600 return false; 600 return false;