diff options
author | UbitUmarov | 2019-02-21 22:54:17 +0000 |
---|---|---|
committer | UbitUmarov | 2019-02-21 22:54:43 +0000 |
commit | ece38437983440449acbc7f7202c470e72ae4e61 (patch) | |
tree | 647f7b6333d116d7e7fea933852daa118c538567 /OpenSim/Region/Framework/Scenes | |
parent | Yengine changed position and shape events can bt throttled by mineventdelay (diff) | |
download | opensim-SC-ece38437983440449acbc7f7202c470e72ae4e61.zip opensim-SC-ece38437983440449acbc7f7202c470e72ae4e61.tar.gz opensim-SC-ece38437983440449acbc7f7202c470e72ae4e61.tar.bz2 opensim-SC-ece38437983440449acbc7f7202c470e72ae4e61.tar.xz |
let changed allowed drop have lldetectedkey[0] return the dropped item id, Yengine and still testing"
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index f76f882..edc8886 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -539,7 +539,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
539 | /// <see cref="SceneObjectPart.TriggerScriptChangedEvent"/> | 539 | /// <see cref="SceneObjectPart.TriggerScriptChangedEvent"/> |
540 | /// </remarks> | 540 | /// </remarks> |
541 | public event ScriptChangedEvent OnScriptChangedEvent; | 541 | public event ScriptChangedEvent OnScriptChangedEvent; |
542 | public delegate void ScriptChangedEvent(uint localID, uint change); | 542 | public delegate void ScriptChangedEvent(uint localID, uint change, object data); |
543 | 543 | ||
544 | public delegate void ScriptControlEvent(UUID item, UUID avatarID, uint held, uint changed); | 544 | public delegate void ScriptControlEvent(UUID item, UUID avatarID, uint held, uint changed); |
545 | 545 | ||
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1185 | } | 1185 | } |
1186 | } | 1186 | } |
1187 | 1187 | ||
1188 | public void TriggerOnScriptChangedEvent(uint localID, uint change) | 1188 | public void TriggerOnScriptChangedEvent(uint localID, uint change, object parameter = null) |
1189 | { | 1189 | { |
1190 | ScriptChangedEvent handlerScriptChangedEvent = OnScriptChangedEvent; | 1190 | ScriptChangedEvent handlerScriptChangedEvent = OnScriptChangedEvent; |
1191 | if (handlerScriptChangedEvent != null) | 1191 | if (handlerScriptChangedEvent != null) |
@@ -1194,7 +1194,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1194 | { | 1194 | { |
1195 | try | 1195 | try |
1196 | { | 1196 | { |
1197 | d(localID, change); | 1197 | d(localID, change, parameter); |
1198 | } | 1198 | } |
1199 | catch (Exception e) | 1199 | catch (Exception e) |
1200 | { | 1200 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a23ebbf..23bef74 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4439,10 +4439,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
4439 | SceneObjectSerializer.SOPToXml2(xmlWriter, this, new Dictionary<string, object>()); | 4439 | SceneObjectSerializer.SOPToXml2(xmlWriter, this, new Dictionary<string, object>()); |
4440 | } | 4440 | } |
4441 | 4441 | ||
4442 | public void TriggerScriptChangedEvent(Changed val) | 4442 | public void TriggerScriptChangedEvent(Changed val, object data = null) |
4443 | { | 4443 | { |
4444 | if (ParentGroup != null && ParentGroup.Scene != null) | 4444 | if (ParentGroup != null && ParentGroup.Scene != null) |
4445 | ParentGroup.Scene.EventManager.TriggerOnScriptChangedEvent(LocalId, (uint)val); | 4445 | ParentGroup.Scene.EventManager.TriggerOnScriptChangedEvent(LocalId, (uint)val, data); |
4446 | } | 4446 | } |
4447 | 4447 | ||
4448 | public void TrimPermissions() | 4448 | public void TrimPermissions() |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index bc9ab7f..a0f8959 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -816,7 +816,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
816 | m_items.Add(item.ItemID, item); | 816 | m_items.Add(item.ItemID, item); |
817 | m_items.LockItemsForWrite(false); | 817 | m_items.LockItemsForWrite(false); |
818 | if (allowedDrop) | 818 | if (allowedDrop) |
819 | m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); | 819 | m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP, item.ItemID); |
820 | else | 820 | else |
821 | m_part.TriggerScriptChangedEvent(Changed.INVENTORY); | 821 | m_part.TriggerScriptChangedEvent(Changed.INVENTORY); |
822 | 822 | ||