diff options
author | Melanie | 2010-07-11 13:09:11 +0100 |
---|---|---|
committer | Melanie | 2010-07-11 13:09:11 +0100 |
commit | eaea89bbb74ad219a01c5dd81e1e4b5d8c1a15a4 (patch) | |
tree | 5ee0558b581da8418ed19e04bf9cc8b9d2ea1f8f /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Make taken items go back to the folder they came from (diff) | |
download | opensim-SC-eaea89bbb74ad219a01c5dd81e1e4b5d8c1a15a4.zip opensim-SC-eaea89bbb74ad219a01c5dd81e1e4b5d8c1a15a4.tar.gz opensim-SC-eaea89bbb74ad219a01c5dd81e1e4b5d8c1a15a4.tar.bz2 opensim-SC-eaea89bbb74ad219a01c5dd81e1e4b5d8c1a15a4.tar.xz |
Remove localID from script controls data. It won't transfer to another
region anyway
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index ef125cd..9db2e41 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
179 | public event ScriptChangedEvent OnScriptChangedEvent; | 179 | public event ScriptChangedEvent OnScriptChangedEvent; |
180 | public delegate void ScriptChangedEvent(uint localID, uint change); | 180 | public delegate void ScriptChangedEvent(uint localID, uint change); |
181 | 181 | ||
182 | public delegate void ScriptControlEvent(uint localID, UUID item, UUID avatarID, uint held, uint changed); | 182 | public delegate void ScriptControlEvent(UUID item, UUID avatarID, uint held, uint changed); |
183 | public event ScriptControlEvent OnScriptControlEvent; | 183 | public event ScriptControlEvent OnScriptControlEvent; |
184 | 184 | ||
185 | public delegate void ScriptAtTargetEvent(uint localID, uint handle, Vector3 targetpos, Vector3 atpos); | 185 | public delegate void ScriptAtTargetEvent(uint localID, uint handle, Vector3 targetpos, Vector3 atpos); |
@@ -1595,7 +1595,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1595 | } | 1595 | } |
1596 | } | 1596 | } |
1597 | 1597 | ||
1598 | internal void TriggerControlEvent(uint p, UUID scriptUUID, UUID avatarID, uint held, uint _changed) | 1598 | internal void TriggerControlEvent(UUID scriptUUID, UUID avatarID, uint held, uint _changed) |
1599 | { | 1599 | { |
1600 | ScriptControlEvent handlerScriptControlEvent = OnScriptControlEvent; | 1600 | ScriptControlEvent handlerScriptControlEvent = OnScriptControlEvent; |
1601 | if (handlerScriptControlEvent != null) | 1601 | if (handlerScriptControlEvent != null) |
@@ -1604,7 +1604,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1604 | { | 1604 | { |
1605 | try | 1605 | try |
1606 | { | 1606 | { |
1607 | d(p, scriptUUID, avatarID, held, _changed); | 1607 | d(scriptUUID, avatarID, held, _changed); |
1608 | } | 1608 | } |
1609 | catch (Exception e) | 1609 | catch (Exception e) |
1610 | { | 1610 | { |