ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-17 04:05:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add per-instance date to DNE to avoid serializing stuff 10 times a second.

Browse Source 
Clode cleanup and removal of commented stuff in ScriptManager.
This commit is contained in:
Melanie Thielker
2008-09-26 15:01:03 +00:00
parent 77eac708fa
commit 24628928c3
7 changed files with 180 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
View File

@@ -198,12 +198,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
if (localID == 0)
return null;
IScript Script = m_ScriptManager.GetScript(localID, itemID);
InstanceData id = m_ScriptManager.GetScript(localID, itemID);
if (Script == null)
if (id == null)
return null;
DetectParams[] det = m_ScriptManager.GetDetectParams(Script);
DetectParams[] det = m_ScriptManager.GetDetectParams(id);
if (number < 0 || number >= det.Length)
return null;
@@ -223,12 +223,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
if (localID == 0)
return;
IScript Script = m_ScriptManager.GetScript(localID, itemID);
InstanceData id = m_ScriptManager.GetScript(localID, itemID);
if (Script == null)
if (id == null)
return;
string currentState = Script.State;
string currentState = id.State;
if (currentState != state)
{
@@ -239,22 +239,29 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
}
catch (AppDomainUnloadedException)
{
Console.WriteLine("[SCRIPT]: state change called when script was unloaded. Nothing to worry about, but noting the occurance");
Console.WriteLine("[SCRIPT]: state change called when "+
"script was unloaded. Nothing to worry about, "+
"but noting the occurance");
}
Script.State = state;
id.State = state;
try
{
int eventFlags = m_ScriptManager.GetStateEventFlags(localID, itemID);
int eventFlags = m_ScriptManager.GetStateEventFlags(localID,
itemID);
SceneObjectPart part = m_Scene.GetSceneObjectPart(itemID);
if (part != null)
part.SetScriptEvents(itemID, eventFlags);
m_EventManager.state_entry(localID);
}
catch (AppDomainUnloadedException)
{
Console.WriteLine("[SCRIPT]: state change called when script was unloaded. Nothing to worry about, but noting the occurance");
Console.WriteLine("[SCRIPT]: state change called when "+
"script was unloaded. Nothing to worry about, but "+
"noting the occurance");
}
}
}
@@ -265,11 +272,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
if (localID == 0)
return false;
IScript script = m_ScriptManager.GetScript(localID, itemID);
if (script == null)
InstanceData id = m_ScriptManager.GetScript(localID, itemID);
if (id == null)
return false;
return script.Exec.Running?true:false;
return id.Running;
}
public void SetScriptState(UUID itemID, bool state)
@@ -278,11 +285,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
if (localID == 0)
return;
IScript script = m_ScriptManager.GetScript(localID, itemID);
if (script == null)
InstanceData id = m_ScriptManager.GetScript(localID, itemID);
if (id == null)
return;
script.Exec.Running = state;
if (!id.Disabled)
id.Running = state;
}
public void ApiResetScript(UUID itemID)