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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2021-11-20 02:46:07 +00:00
parent ca7b6e7deb
commit 1692254e3f
6 changed files with 113 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
View File

@@ -993,10 +993,13 @@ namespace OpenSim.Region.ScriptEngine.Yengine
{
XMRInstance instance = GetInstance(itemID);
if(instance != null)
{
instance.Running = state;
if(instance.m_Item != null)
instance.m_Item.ScriptRunning = instance.Running;
}
}
// Control display of the "running" checkbox
//
public bool GetScriptState(UUID itemID)
{
@@ -1145,8 +1148,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
return false;
isX = true;
}
// <ScriptState>...</ScriptState> contains contents of .state file.
XmlElement scriptStateN = (XmlElement)stateN.SelectSingleNode("ScriptState");
// <ScriptState>...</ScriptState> contains contents of .state file.
XmlElement scriptStateN = (XmlElement)stateN.SelectSingleNode("ScriptState");
if(scriptStateN == null)
return false;

67
OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
View File

@@ -370,9 +370,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
doGblInit = true;
stateCode = 0;
PostEvent(new EventParams("state_entry",
zeroObjectArray,
zeroDetectParams));
PostEvent(EventParams.StateEntryParams);
}
else
{
@@ -403,52 +401,47 @@ namespace OpenSim.Region.ScriptEngine.Yengine
doGblInit = true;
stateCode = 0;
PostEvent(new EventParams("state_entry",
zeroObjectArray,
zeroDetectParams));
PostEvent(EventParams.StateEntryParams);
}
}
// Post event(s) saying what caused the script to start.
if(m_PostOnRez)
//if(m_Running)
{
PostEvent(new EventParams("on_rez",
new Object[] { m_StartParam },
zeroDetectParams));
}
switch(m_StateSource)
{
case StateSource.AttachedRez:
PostEvent(new EventParams("attach",
new object[] { m_Part.ParentGroup.AttachedAvatar.ToString() },
if(m_PostOnRez)
{
PostEvent(new EventParams("on_rez",
new object[] { m_StartParam },
zeroDetectParams));
break;
}
case StateSource.PrimCrossing:
PostEvent(new EventParams("changed",
sbcCR,
zeroDetectParams));
break;
switch(m_StateSource)
{
case StateSource.AttachedRez:
PostEvent(new EventParams("attach",
new object[] { m_Part.ParentGroup.AttachedAvatar.ToString() },
zeroDetectParams));
break;
case StateSource.Teleporting:
PostEvent(new EventParams("changed",
sbcCRT,
zeroDetectParams));
break;
case StateSource.PrimCrossing:
PostEvent(changedEvent_CR);
break;
case StateSource.RegionStart:
PostEvent(new EventParams("changed",
sbcCRS,
zeroDetectParams));
break;
case StateSource.Teleporting:
PostEvent(changedEvent_CRT);
break;
case StateSource.RegionStart:
PostEvent(changedEvent_CRS);
break;
}
}
}
private static Object[] sbcCRS = new Object[] { ScriptBaseClass.CHANGED_REGION_START };
private static Object[] sbcCR = new Object[] { ScriptBaseClass.CHANGED_REGION };
private static Object[] sbcCT = new Object[] { ScriptBaseClass.CHANGED_TELEPORT };
private static Object[] sbcCRT = new Object[] { ScriptBaseClass.CHANGED_REGION | ScriptBaseClass.CHANGED_TELEPORT };
private static EventParams changedEvent_CR = new EventParams("changed", new object[] { CHANGED_REGION }, zeroDetectParams);
private static EventParams changedEvent_CT = new EventParams("changed", new object[] { CHANGED_TELEPORT }, zeroDetectParams);
private static EventParams changedEvent_CRT = new EventParams("changed", new object[] { CHANGED_REGION | CHANGED_TELEPORT }, zeroDetectParams);
private static EventParams changedEvent_CRS = new EventParams("changed", new object[] { CHANGED_REGION_START }, zeroDetectParams);
/**
* @brief Save compilation error messages for later retrieval

17
OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
View File

@@ -426,14 +426,13 @@ namespace OpenSim.Region.ScriptEngine.Yengine
CheckRunLockInvariants(true);
return XMRInstState.FINISHED;
}
// If event handler completed, get rid of detect params.
if(this.eventCode == ScriptEventCode.None)
m_DetectParams = null;
}
finally
{
// If event handler completed, get rid of detect params.
if (eventCode == ScriptEventCode.None)
m_DetectParams = null;
//m_RunOnePhase += "; checking exit invariants and unlocking";
CheckRunLockInvariants(false);
Monitor.Exit(m_RunLock);
@@ -910,9 +909,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
stateCode = 0;
m_Part.RemoveScriptTargets(m_ItemID);
m_Part.SetScriptEvents(m_ItemID, GetStateEventFlags(0));
PostEvent(new EventParams("state_entry",
zeroObjectArray,
zeroDetectParams));
PostEvent(EventParams.StateEntryParams);
// Tell CheckRun() to let script run.
suspendOnCheckRunHold = false;
@@ -993,7 +990,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
break;
default:
{
throw new Exception("callMode=" + callMode);
}
}
//m_CheckRunPhase = "resumed";
@@ -1004,7 +1003,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// Upon return from CheckRun() it should always be the case that the script is
// going to process calls normally, neither saving nor restoring stack frame state.
if(callMode != CallMode_NORMAL)
{
throw new Exception("bad callMode " + callMode);
}
}
/**