diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6c119c2..7f98877 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -60,7 +60,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
60 | struct ScriptControllers | 60 | struct ScriptControllers |
61 | { | 61 | { |
62 | public UUID itemID; | 62 | public UUID itemID; |
63 | public uint objID; | ||
64 | public ScriptControlled ignoreControls; | 63 | public ScriptControlled ignoreControls; |
65 | public ScriptControlled eventControls; | 64 | public ScriptControlled eventControls; |
66 | } | 65 | } |
@@ -3468,7 +3467,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3468 | obj.eventControls = ScriptControlled.CONTROL_ZERO; | 3467 | obj.eventControls = ScriptControlled.CONTROL_ZERO; |
3469 | 3468 | ||
3470 | obj.itemID = Script_item_UUID; | 3469 | obj.itemID = Script_item_UUID; |
3471 | obj.objID = Obj_localID; | ||
3472 | if (pass_on == 0 && accept == 0) | 3470 | if (pass_on == 0 && accept == 0) |
3473 | { | 3471 | { |
3474 | IgnoredControls |= (ScriptControlled)controls; | 3472 | IgnoredControls |= (ScriptControlled)controls; |
@@ -3611,7 +3609,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3611 | if (localHeld != ScriptControlled.CONTROL_ZERO || localChange != ScriptControlled.CONTROL_ZERO) | 3609 | if (localHeld != ScriptControlled.CONTROL_ZERO || localChange != ScriptControlled.CONTROL_ZERO) |
3612 | { | 3610 | { |
3613 | // only send if still pressed or just changed | 3611 | // only send if still pressed or just changed |
3614 | m_scene.EventManager.TriggerControlEvent(scriptControlData.objID, scriptUUID, UUID, (uint)localHeld, (uint)localChange); | 3612 | m_scene.EventManager.TriggerControlEvent(scriptUUID, UUID, (uint)localHeld, (uint)localChange); |
3615 | } | 3613 | } |
3616 | } | 3614 | } |
3617 | } | 3615 | } |