OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix http://opensimulator.org/mantis/view.php?id=2517 

* Don't save attachments on saving oar, which stops them coming back as ghost prims
0.6.0-stable
Justin Clarke Casey 2008-11-01 21:28:52 +00:00
parent 388c053dcb
commit b03e34dd2d
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -4129,6 +4129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders); handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders);
} }
break; break;
case PacketType.TerminateFriendship: case PacketType.TerminateFriendship:
TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack;
UUID listOwnerAgentID = tfriendpack.AgentData.AgentID; UUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
@ -4140,22 +4141,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); handlerTerminateFriendship(this, listOwnerAgentID, exFriendID);
} }
break; break;
case PacketType.RezObject: case PacketType.RezObject:
RezObjectPacket rezPacket = (RezObjectPacket)Pack; RezObjectPacket rezPacket = (RezObjectPacket)Pack;
handlerRezObject = OnRezObject; handlerRezObject = OnRezObject;
if (handlerRezObject != null) if (handlerRezObject != null)
{ {
//rezPacket.RezData.BypassRaycast;
//rezPacket.RezData.RayEnd;
//rezPacket.RezData.RayEndIsIntersection;
//rezPacket.RezData.RayStart;
//rezPacket.RezData.RayTargetID;
//rezPacket.RezData.RemoveItem;
//rezPacket.RezData.RezSelected;
//rezPacket.RezData.FromTaskID;
//m_log.Info("[REZData]: " + rezPacket.ToString());
handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
@ -4163,6 +4155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
rezPacket.RezData.FromTaskID); rezPacket.RezData.FromTaskID);
} }
break; break;
case PacketType.DeRezObject: case PacketType.DeRezObject:
DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack; DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack;
handlerDeRezObject = OnDeRezObject; handlerDeRezObject = OnDeRezObject;
@ -4178,6 +4171,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
break; break;
case PacketType.ModifyLand: case PacketType.ModifyLand:
ModifyLandPacket modify = (ModifyLandPacket)Pack; ModifyLandPacket modify = (ModifyLandPacket)Pack;
//m_log.Info("[LAND]: LAND:" + modify.ToString()); //m_log.Info("[LAND]: LAND:" + modify.ToString());

5
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -293,9 +293,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
CloseCircuit(reusedEpSender, e); CloseCircuit(reusedEpSender, e);
} }
catch (Exception a) catch (Exception e2)
{ {
m_log.Error("[UDPSERVER]: " + a); m_log.ErrorFormat(
"[CLIENT]: Exception thrown when trying to close the circuit for {0} - {1}", reusedEpSender, e2);
} }
// ENDLESS LOOP ON PURPOSE! // ENDLESS LOOP ON PURPOSE!

7
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@ -273,7 +273,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
foreach (EntityBase entity in entities) foreach (EntityBase entity in entities)
{ {
if (entity is SceneObjectGroup) if (entity is SceneObjectGroup)
sceneObjects.Add((SceneObjectGroup)entity); {
SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
if (sceneObject.RootPart != null && !sceneObject.RootPart.IsAttachment)
sceneObjects.Add((SceneObjectGroup)entity);
}
} }
foreach (SceneObjectGroup sceneObject in sceneObjects) foreach (SceneObjectGroup sceneObject in sceneObjects)

2
OpenSim/Region/Environment/Scenes/EntityBase.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
/// <summary> /// <summary>
/// Signals whether this group was in a scene but has since been deleted from it. /// Signals whether this entity was in a scene but has since been removed from it.
/// </summary> /// </summary>
public bool IsDeleted public bool IsDeleted
{ {

1
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -741,7 +741,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor); m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor);
m_rootPart.PhysActor = null; m_rootPart.PhysActor = null;
} }
AbsolutePosition = AttachOffset; AbsolutePosition = AttachOffset;