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

Merge branch 'master' into careminster

avinationmerge
Melanie 2009-12-22 15:37:24 +00:00
parent 28c7bb99bf 33d5018e94
commit 73491cceed
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
View File

@ -76,7 +76,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
void SetScriptState(UUID itemID, bool state); void SetScriptState(UUID itemID, bool state);
bool GetScriptState(UUID itemID); bool GetScriptState(UUID itemID);
void SetState(UUID itemID, string newState);
void ApiResetScript(UUID itemID); void ApiResetScript(UUID itemID);
void ResetScript(UUID itemID); void ResetScript(UUID itemID);
IConfig Config { get; } IConfig Config { get; }

16
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -1264,22 +1264,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return UUID.Zero; return UUID.Zero;
} }
[DebuggerNonUserCode]
public void SetState(UUID itemID, string newState)
{
IScriptInstance instance = GetInstance(itemID);
if (instance == null)
return;
instance.SetState(newState);
}
public string GetState(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance == null)
return "default";
return instance.State;
}
public int GetStartParameter(UUID itemID) public int GetStartParameter(UUID itemID)
{ {
IScriptInstance instance = GetInstance(itemID); IScriptInstance instance = GetInstance(itemID);