diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 3a35e21..69bd310 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -28,9 +28,8 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using libsecondlife.Packets; | 30 | using libsecondlife.Packets; |
31 | using OpenSim.Framework.Console; | ||
32 | using OpenSim.Framework.Interfaces; | ||
33 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Console; | ||
34 | 33 | ||
35 | namespace OpenSim.Region.Environment.Scenes | 34 | namespace OpenSim.Region.Environment.Scenes |
36 | { | 35 | { |
@@ -73,12 +72,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
73 | { | 72 | { |
74 | ChatFromViewerArgs args = new ChatFromViewerArgs(); | 73 | ChatFromViewerArgs args = new ChatFromViewerArgs(); |
75 | 74 | ||
76 | args.Message = OpenSim.Framework.Util.FieldToString(message); | 75 | args.Message = Util.FieldToString(message); |
77 | args.Channel = channel; | 76 | args.Channel = channel; |
78 | args.Type = (ChatTypeEnum)type; | 77 | args.Type = (ChatTypeEnum) type; |
79 | args.Position = fromPos; | 78 | args.Position = fromPos; |
80 | 79 | ||
81 | ScenePresence user = this.GetScenePresence(fromAgentID); | 80 | ScenePresence user = GetScenePresence(fromAgentID); |
82 | if (user != null) | 81 | if (user != null) |
83 | args.Sender = user.ControllingClient; | 82 | args.Sender = user.ControllingClient; |
84 | else | 83 | else |
@@ -488,10 +487,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
488 | 487 | ||
489 | public void StartAnimation(LLUUID animID, int seq, LLUUID agentId) | 488 | public void StartAnimation(LLUUID animID, int seq, LLUUID agentId) |
490 | { | 489 | { |
491 | Broadcast(delegate(IClientAPI client) | 490 | Broadcast(delegate(IClientAPI client) { client.SendAnimation(animID, seq, agentId); }); |
492 | { | ||
493 | client.SendAnimation(animID, seq, agentId); | ||
494 | }); | ||
495 | } | 491 | } |
496 | 492 | ||
497 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 493 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
@@ -503,14 +499,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
503 | if (ent is SceneObjectGroup) | 499 | if (ent is SceneObjectGroup) |
504 | { | 500 | { |
505 | SceneObjectGroup obj = ent as SceneObjectGroup; | 501 | SceneObjectGroup obj = ent as SceneObjectGroup; |
506 | 502 | ||
507 | if( obj.HasChildPrim( localID ) ) | 503 | if (obj.HasChildPrim(localID)) |
508 | { | 504 | { |
509 | obj.ObjectGrabHandler(localID, offsetPos, remoteClient); | 505 | obj.ObjectGrabHandler(localID, offsetPos, remoteClient); |
510 | return; | 506 | return; |
511 | } | 507 | } |
512 | } | 508 | } |
513 | } | 509 | } |
514 | } | 510 | } |
515 | } | 511 | } |
516 | } | 512 | } \ No newline at end of file |