aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/EventManager.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-01-29 23:12:08 +0000
committerJustin Clark-Casey (justincc)2010-01-29 23:12:08 +0000
commit05a3e37b853fc870b83eb67b47bc70eb724f652e (patch)
tree8fddceb9442ed0352c1b5f04a79ee2242bd4d6d1 /OpenSim/Region/Framework/Scenes/EventManager.cs
parentApply http://opensimulator.org/mantis/view.php?id=4548 (diff)
downloadopensim-SC-05a3e37b853fc870b83eb67b47bc70eb724f652e.zip
opensim-SC-05a3e37b853fc870b83eb67b47bc70eb724f652e.tar.gz
opensim-SC-05a3e37b853fc870b83eb67b47bc70eb724f652e.tar.bz2
opensim-SC-05a3e37b853fc870b83eb67b47bc70eb724f652e.tar.xz
Apply http://opensimulator.org/mantis/view.php?id=3334
Send continuous touch() events if the left mouse button is held down while moving over an object This conforms with Linden Lab practice Thanks Revolution
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 399379e..004ea1f 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -104,6 +104,7 @@ namespace OpenSim.Region.Framework.Scenes
104 public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; 104 public event OnSetRootAgentSceneDelegate OnSetRootAgentScene;
105 105
106 public event ObjectGrabDelegate OnObjectGrab; 106 public event ObjectGrabDelegate OnObjectGrab;
107 public event ObjectGrabDelegate OnObjectGrabbing;
107 public event ObjectDeGrabDelegate OnObjectDeGrab; 108 public event ObjectDeGrabDelegate OnObjectDeGrab;
108 public event ScriptResetDelegate OnScriptReset; 109 public event ScriptResetDelegate OnScriptReset;
109 110
@@ -408,6 +409,7 @@ namespace OpenSim.Region.Framework.Scenes
408 private OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = null; //OnParcelPrimCountAdd; 409 private OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = null; //OnParcelPrimCountAdd;
409 private OnShutdownDelegate handlerShutdown = null; //OnShutdown; 410 private OnShutdownDelegate handlerShutdown = null; //OnShutdown;
410 private ObjectGrabDelegate handlerObjectGrab = null; //OnObjectGrab; 411 private ObjectGrabDelegate handlerObjectGrab = null; //OnObjectGrab;
412 private ObjectGrabDelegate handlerObjectGrabbing = null; //OnObjectGrabbing;
411 private ObjectDeGrabDelegate handlerObjectDeGrab = null; //OnObjectDeGrab; 413 private ObjectDeGrabDelegate handlerObjectDeGrab = null; //OnObjectDeGrab;
412 private ScriptResetDelegate handlerScriptReset = null; // OnScriptReset 414 private ScriptResetDelegate handlerScriptReset = null; // OnScriptReset
413 private NewRezScript handlerRezScript = null; //OnRezScript; 415 private NewRezScript handlerRezScript = null; //OnRezScript;
@@ -620,6 +622,15 @@ namespace OpenSim.Region.Framework.Scenes
620 } 622 }
621 } 623 }
622 624
625 public void TriggerObjectGrabbing(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs)
626 {
627 handlerObjectGrabbing = OnObjectGrabbing;
628 if (handlerObjectGrabbing != null)
629 {
630 handlerObjectGrabbing(localID, originalID, offsetPos, remoteClient, surfaceArgs);
631 }
632 }
633
623 public void TriggerObjectDeGrab(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) 634 public void TriggerObjectDeGrab(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs)
624 { 635 {
625 handlerObjectDeGrab = OnObjectDeGrab; 636 handlerObjectDeGrab = OnObjectDeGrab;