diff options
author | lbsa71 | 2007-09-20 05:22:18 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-20 05:22:18 +0000 |
commit | 3c7161d12884e1d13db6261bea087e16541e376e (patch) | |
tree | 546f790e74463c3d962ea7cb8269b0e31ba10b51 /OpenSim/Region/Environment | |
parent | * Added TryGetAvatar to SceneManager (diff) | |
download | opensim-SC_OLD-3c7161d12884e1d13db6261bea087e16541e376e.zip opensim-SC_OLD-3c7161d12884e1d13db6261bea087e16541e376e.tar.gz opensim-SC_OLD-3c7161d12884e1d13db6261bea087e16541e376e.tar.bz2 opensim-SC_OLD-3c7161d12884e1d13db6261bea087e16541e376e.tar.xz |
* Rewired Touch to route to group/part (Still triggering EventManager as well)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneEvents.cs | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 5a7dda5..efd682f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -516,6 +516,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
516 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 516 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
517 | { | 517 | { |
518 | EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient); | 518 | EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient); |
519 | |||
520 | foreach (EntityBase ent in Entities.Values) | ||
521 | { | ||
522 | if (ent is SceneObjectGroup) | ||
523 | { | ||
524 | SceneObjectGroup obj = ent as SceneObjectGroup; | ||
525 | |||
526 | if( obj.HasChildPrim( localID ) ) | ||
527 | { | ||
528 | obj.ObjectGrabHandler(localID, offsetPos, remoteClient); | ||
529 | return; | ||
530 | } | ||
531 | } | ||
532 | } | ||
519 | } | 533 | } |
520 | } | 534 | } |
521 | } \ No newline at end of file | 535 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index a5d8667..8e8e9a7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs | |||
@@ -133,7 +133,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
133 | public void TriggerObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 133 | public void TriggerObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
134 | { | 134 | { |
135 | if (OnObjectGrab != null) | 135 | if (OnObjectGrab != null) |
136 | { | ||
136 | OnObjectGrab(localID, offsetPos, remoteClient); | 137 | OnObjectGrab(localID, offsetPos, remoteClient); |
138 | } | ||
137 | } | 139 | } |
138 | 140 | ||
139 | public void TriggerRezScript(uint localID, LLUUID itemID, string script) | 141 | public void TriggerRezScript(uint localID, LLUUID itemID, string script) |