aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs1
5 files changed, 14 insertions, 15 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 07af65d..5b3bc98 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4129,6 +4129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4129 handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders); 4129 handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders);
4130 } 4130 }
4131 break; 4131 break;
4132
4132 case PacketType.TerminateFriendship: 4133 case PacketType.TerminateFriendship:
4133 TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; 4134 TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack;
4134 UUID listOwnerAgentID = tfriendpack.AgentData.AgentID; 4135 UUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
@@ -4140,22 +4141,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4140 handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); 4141 handlerTerminateFriendship(this, listOwnerAgentID, exFriendID);
4141 } 4142 }
4142 break; 4143 break;
4144
4143 case PacketType.RezObject: 4145 case PacketType.RezObject:
4144 RezObjectPacket rezPacket = (RezObjectPacket)Pack; 4146 RezObjectPacket rezPacket = (RezObjectPacket)Pack;
4145 4147
4146 handlerRezObject = OnRezObject; 4148 handlerRezObject = OnRezObject;
4147 if (handlerRezObject != null) 4149 if (handlerRezObject != null)
4148 { 4150 {
4149 //rezPacket.RezData.BypassRaycast;
4150 //rezPacket.RezData.RayEnd;
4151 //rezPacket.RezData.RayEndIsIntersection;
4152 //rezPacket.RezData.RayStart;
4153 //rezPacket.RezData.RayTargetID;
4154 //rezPacket.RezData.RemoveItem;
4155 //rezPacket.RezData.RezSelected;
4156 //rezPacket.RezData.FromTaskID;
4157 //m_log.Info("[REZData]: " + rezPacket.ToString());
4158
4159 handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, 4151 handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
4160 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, 4152 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
4161 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, 4153 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
@@ -4163,6 +4155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4163 rezPacket.RezData.FromTaskID); 4155 rezPacket.RezData.FromTaskID);
4164 } 4156 }
4165 break; 4157 break;
4158
4166 case PacketType.DeRezObject: 4159 case PacketType.DeRezObject:
4167 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack; 4160 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack;
4168 handlerDeRezObject = OnDeRezObject; 4161 handlerDeRezObject = OnDeRezObject;
@@ -4178,6 +4171,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4178 } 4171 }
4179 } 4172 }
4180 break; 4173 break;
4174
4181 case PacketType.ModifyLand: 4175 case PacketType.ModifyLand:
4182 ModifyLandPacket modify = (ModifyLandPacket)Pack; 4176 ModifyLandPacket modify = (ModifyLandPacket)Pack;
4183 //m_log.Info("[LAND]: LAND:" + modify.ToString()); 4177 //m_log.Info("[LAND]: LAND:" + modify.ToString());
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 52a2467..ba4e18b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -293,9 +293,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
293 { 293 {
294 CloseCircuit(reusedEpSender, e); 294 CloseCircuit(reusedEpSender, e);
295 } 295 }
296 catch (Exception a) 296 catch (Exception e2)
297 { 297 {
298 m_log.Error("[UDPSERVER]: " + a); 298 m_log.ErrorFormat(
299 "[CLIENT]: Exception thrown when trying to close the circuit for {0} - {1}", reusedEpSender, e2);
299 } 300 }
300 301
301 // ENDLESS LOOP ON PURPOSE! 302 // ENDLESS LOOP ON PURPOSE!
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 4a51398..8c623b1 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -273,7 +273,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
273 foreach (EntityBase entity in entities) 273 foreach (EntityBase entity in entities)
274 { 274 {
275 if (entity is SceneObjectGroup) 275 if (entity is SceneObjectGroup)
276 sceneObjects.Add((SceneObjectGroup)entity); 276 {
277 SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
278
279 if (sceneObject.RootPart != null && !sceneObject.RootPart.IsAttachment)
280 sceneObjects.Add((SceneObjectGroup)entity);
281 }
277 } 282 }
278 283
279 foreach (SceneObjectGroup sceneObject in sceneObjects) 284 foreach (SceneObjectGroup sceneObject in sceneObjects)
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index afdbb91..7a3b9a7 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
64 } 64 }
65 65
66 /// <summary> 66 /// <summary>
67 /// Signals whether this group was in a scene but has since been deleted from it. 67 /// Signals whether this entity was in a scene but has since been removed from it.
68 /// </summary> 68 /// </summary>
69 public bool IsDeleted 69 public bool IsDeleted
70 { 70 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 98c7fb5..f4b6685 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -741,7 +741,6 @@ namespace OpenSim.Region.Environment.Scenes
741 { 741 {
742 m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor); 742 m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor);
743 m_rootPart.PhysActor = null; 743 m_rootPart.PhysActor = null;
744
745 } 744 }
746 745
747 AbsolutePosition = AttachOffset; 746 AbsolutePosition = AttachOffset;