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

Mantis#1856. Thank you kindly, HomerHorwitz for a patch that: 

Fixes this Mantis bug with llTakeControls() & ControllingClient() API.
0.6.0-stable
Charles Krinke 2008-08-13 14:52:14 +00:00
parent dd1fc5e3fe
commit 3278ab8397
1 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -872,7 +872,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (scriptedcontrols.Count > 0) if (scriptedcontrols.Count > 0)
{ {
SendControlToScripts(flags, LastCommands); SendControlToScripts(flags);
flags = this.RemoveIgnoredControls(flags, IgnoredControls); flags = this.RemoveIgnoredControls(flags, IgnoredControls);
} }
@ -2741,11 +2741,12 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
internal void SendControlToScripts(uint flags, ScriptControlled lastFlags) internal void SendControlToScripts(uint flags)
{ {
ScriptControlled allflags = ScriptControlled.CONTROL_ZERO; ScriptControlled allflags = ScriptControlled.CONTROL_ZERO;
// find all activated controls, whether the scripts are interested in them or not
if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) != 0) if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) != 0)
{ {
allflags |= ScriptControlled.CONTROL_FWD; allflags |= ScriptControlled.CONTROL_FWD;
@ -2770,11 +2771,11 @@ namespace OpenSim.Region.Environment.Scenes
{ {
allflags |= ScriptControlled.CONTROL_RIGHT; allflags |= ScriptControlled.CONTROL_RIGHT;
} }
if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0) if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
{ {
allflags |= ScriptControlled.CONTROL_ROT_RIGHT; allflags |= ScriptControlled.CONTROL_ROT_RIGHT;
} }
if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0) if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0)
{ {
allflags |= ScriptControlled.CONTROL_ROT_LEFT; allflags |= ScriptControlled.CONTROL_ROT_LEFT;
} }
@ -2787,45 +2788,24 @@ namespace OpenSim.Region.Environment.Scenes
allflags |= ScriptControlled.CONTROL_LBUTTON; allflags |= ScriptControlled.CONTROL_LBUTTON;
} }
ScriptControlled held = ScriptControlled.CONTROL_ZERO; // optimization; we have to check per script, but if nothing is pressed and nothing changed, we can skip that
ScriptControlled change = ScriptControlled.CONTROL_ZERO; if(allflags != ScriptControlled.CONTROL_ZERO || allflags != LastCommands) {
lock (scriptedcontrols)
foreach (ScriptControlled DCF in Enum.GetValues(typeof (ScriptControlled)))
{
// Held
if ((lastFlags & DCF) != 0 && (allflags & DCF) != 0)
{ {
held |= DCF; foreach (LLUUID scriptUUID in scriptedcontrols.Keys)
continue; {
} ScriptControllers scriptControlData = scriptedcontrols[scriptUUID];
// Not held recently ScriptControlled localHeld = allflags & scriptControlData.eventControls; // the flags interesting for us
if ((lastFlags & DCF) != 0 && (allflags & DCF) == 0) ScriptControlled localLast = LastCommands & scriptControlData.eventControls; // the activated controls in the last cycle
{ ScriptControlled localChange = localHeld ^ localLast; // the changed bits
change |= DCF; if(localHeld != ScriptControlled.CONTROL_ZERO || localChange != ScriptControlled.CONTROL_ZERO) {
continue; // only send if still pressed or just changed
} m_scene.EventManager.TriggerControlEvent(scriptControlData.objID, scriptUUID, UUID, (uint)localHeld, (uint)localChange);
// Newly pressed. }
if ((lastFlags & DCF) == 0 && (allflags & DCF) != 0) }
{
change |= DCF;
continue;
}
}
lock (scriptedcontrols)
{
foreach (LLUUID scriptUUID in scriptedcontrols.Keys)
{
ScriptControllers scriptControlData = scriptedcontrols[scriptUUID];
ScriptControlled localHeld = held & scriptControlData.eventControls;
//if (localHeld != ScriptControlled.CONTROL_ZERO)
//{
//int i = 1;
//}
ScriptControlled localChange = change & scriptControlData.eventControls;
m_scene.EventManager.TriggerControlEvent(scriptControlData.objID, scriptUUID, UUID, (uint)localHeld, (uint)localChange);
} }
} }
LastCommands = allflags; LastCommands = allflags;
} }