diff options
Shift and Drag copying should now work correctly. [This was one of those stupid little one line bugs that was so much fun to track down that I decided to spend a few hours on it)
Linking groups should now work better than it did, but still a bit of work to do on getting the rotations of all the parts after linking right.
Added part of dalien's #301 patch (xml loading/saving related parts with some small changes)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 1db9d29..0180e14 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
132 | ScenePresence fromAvatar = this.Avatars[fromAgentID]; | 132 | ScenePresence fromAvatar = this.Avatars[fromAgentID]; |
133 | ScenePresence toAvatar = this.Avatars[toAgentID]; | 133 | ScenePresence toAvatar = this.Avatars[toAgentID]; |
134 | string fromName = fromAvatar.Firstname + " " + fromAvatar.Lastname; | 134 | string fromName = fromAvatar.Firstname + " " + fromAvatar.Lastname; |
135 | toAvatar.ControllingClient.SendInstantMessage( fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromName, dialog, timestamp); | 135 | toAvatar.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromName, dialog, timestamp); |
136 | } | 136 | } |
137 | else | 137 | else |
138 | { | 138 | { |
@@ -508,15 +508,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
508 | 508 | ||
509 | public void UpdatePrimSinglePosition(uint localID, LLVector3 pos, IClientAPI remoteClient) | 509 | public void UpdatePrimSinglePosition(uint localID, LLVector3 pos, IClientAPI remoteClient) |
510 | { | 510 | { |
511 | Primitive prim = null; | 511 | bool hasPrim = false; |
512 | foreach (EntityBase ent in Entities.Values) | 512 | foreach (EntityBase ent in Entities.Values) |
513 | { | 513 | { |
514 | if (ent is SceneObjectGroup) | 514 | if (ent is SceneObjectGroup) |
515 | { | 515 | { |
516 | //prim = ((SceneObject)ent).HasChildPrim(localID); | 516 | hasPrim = ((SceneObjectGroup)ent).HasChildPrim(localID); |
517 | if (prim != null) | 517 | if (hasPrim != false) |
518 | { | 518 | { |
519 | prim.UpdateSinglePosition(pos); | 519 | ((SceneObjectGroup)ent).UpdateSinglePosition(pos, localID); |
520 | break; | 520 | break; |
521 | } | 521 | } |
522 | } | 522 | } |
@@ -653,7 +653,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
653 | }*/ | 653 | }*/ |
654 | } | 654 | } |
655 | 655 | ||
656 | 656 | ||
657 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 657 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
658 | { | 658 | { |
659 | this.EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient); | 659 | this.EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient); |