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

2nd stab at that prim loading nasty

0.6.0-stable
Melanie Thielker 2008-10-11 16:32:31 +00:00
parent 625c67de54
commit 44b2ecf29d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </returns>
protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
{
if (sceneObject.RootPart == null)
if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == null)
return false;
sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim);

9
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -35,7 +35,7 @@ using System.Reflection;
using System.Globalization;
using System.Xml;
using OpenMetaverse;
//using log4net;
using log4net;
using Nini.Config;
using Amib.Threading;
using OpenSim.Framework;
@ -52,7 +52,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{
public class ScriptInstance : IScriptInstance
{
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IScriptEngine m_Engine;
private IScriptWorkItem m_CurrentResult = null;
@ -843,7 +843,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
}
}
return message;
m_log.ErrorFormat("Scripting exception:");
m_log.ErrorFormat(e.ToString());
return e.ToString();
}
}
}