rendered paste bodyadam@wizard ~/Code/svn$ diff opensim/OpenSim.RegionServer/world/World.cs opensimbranches/zircon/OpenSim.RegionServer/world/World.cs
200c200,231
< }
---
> }
>
> public void DeRezObject(DeRezObjectPacket DeRezPacket, SimClient AgentClient)
> {
> //Needs to delete object from physics at a later date
> foreach( DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData )
> {
> OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
> foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values)
> {
> if (ent.localid == Data.ObjectLocalID)
> {
> this.localStorage.RemovePrim(ent.uuid);
> lock (OpenSimRoot.Instance.LocalWorld.Entities)
> {
> OpenSimRoot.Instance.LocalWorld.Entities.Remove(ent.uuid);
> }
> KillObjectPacket kill = new KillObjectPacket();
> kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
> kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
> kill.ObjectData[0].ID = ent.localid;
> foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values)
> {
> client.OutPacket(kill);
> }
> this._primCount--;
> OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid);
> }
> }
> }
>
> }
adam@wizard ~/Code/svn$ diff opensim/OpenSim.RegionServer/SimClient.cs opensimbranches/zircon/OpenSim.RegionServer/SimClient.cs
312a313,316
> case PacketType.DeRezObject:
> //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet");
> OpenSimRoot.Instance.LocalWorld.DeRezObject((DeRezObjectPacket)Pack, this);
> break;