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

* MRM Scripts will now no longer disconnect the client if there was an error in compilation or script initialisation. 

* Clarified some debug text for MRM Enabling
0.6.5-rc1
Adam Frisby 2009-04-03 10:30:51 +00:00
parent 7e91f41535
commit 36bc485e7e
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -35,6 +35,7 @@ using log4net;
using Microsoft.CSharp; using Microsoft.CSharp;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
@ -61,18 +62,20 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
} }
else else
{ {
m_log.Info("[MRM] Disabled MRM Module (Express)"); m_log.Info("[MRM] Disabled MRM Module (Disabled in ini)");
} }
} }
else else
{ {
m_log.Info("[MRM] Disabled MRM Module (Omission)"); m_log.Info("[MRM] Disabled MRM Module (Default disabled)");
} }
} }
void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)
{ {
if (script.StartsWith("//MiniMod:C#")) if (script.StartsWith("//MiniMod:C#"))
{
try
{ {
m_log.Info("[MRM] Found C# MRM"); m_log.Info("[MRM] Found C# MRM");
IWorld m_world = new World(m_scene); IWorld m_world = new World(m_scene);
@ -88,6 +91,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
m_log.Info("[MRM] Starting MRM"); m_log.Info("[MRM] Starting MRM");
mmb.Start(); mmb.Start();
} }
catch (Exception e)
{
m_scene.Broadcast(delegate(IClientAPI user)
{
user.SendAlertMessage(
"MiniRegionModule Compilation and Initialisation failed: " + e);
});
}
}
} }
public void PostInitialise() public void PostInitialise()