2 files changed, 29 insertions, 59 deletions

diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.Grid.cs
deleted file mode 100644
index ae4c066..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.Grid.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections;

-using System.Collections.Generic;

-using libsecondlife;

-using libsecondlife.Packets;

-using Nwc.XmlRpc;

-using System.Net;

-using System.Net.Sockets;

-using System.IO;

-using System.Threading;

-using System.Timers;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Utilities;

-using OpenSim.Assets;

-

-namespace OpenSim

-{

-    public partial class ClientView

-    {

-

-        public void EnableNeighbours()

-        {

-            

-        }

-

-        public void CrossSimBorder(LLVector3 avatarpos)

-        {

-        }

-   }

-}

diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
index d35868e..035eb4c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
@@ -189,5 +189,34 @@ namespace OpenSim
             }

             this.OutPacket(mbReply);

         }

+

+        protected PrimData CreatePrimFromObjectAdd(ObjectAddPacket addPacket)

+        {

+            PrimData PData = new PrimData();

+            PData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

+            PData.PCode = addPacket.ObjectData.PCode;

+            PData.PathBegin = addPacket.ObjectData.PathBegin;

+            PData.PathEnd = addPacket.ObjectData.PathEnd;

+            PData.PathScaleX = addPacket.ObjectData.PathScaleX;

+            PData.PathScaleY = addPacket.ObjectData.PathScaleY;

+            PData.PathShearX = addPacket.ObjectData.PathShearX;

+            PData.PathShearY = addPacket.ObjectData.PathShearY;

+            PData.PathSkew = addPacket.ObjectData.PathSkew;

+            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;

+            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;

+            PData.Scale = addPacket.ObjectData.Scale;

+            PData.PathCurve = addPacket.ObjectData.PathCurve;

+            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;

+            PData.ParentID = 0;

+            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;

+            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;

+            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;

+            PData.PathTaperX = addPacket.ObjectData.PathTaperX;

+            PData.PathTaperY = addPacket.ObjectData.PathTaperY;

+            PData.PathTwist = addPacket.ObjectData.PathTwist;

+            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;

+

+            return PData;

+        }

     }

 }