From 05d9593198f1a688e10ab5be1789b5661ad7d61e Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 13 May 2007 12:25:08 +0000
Subject: Added very basic support for maps (likely to only work in sandbox
 mode due to the non functioning remote asset server), also currently just
 uses textures that we already had added to the asset server (this is the
 first thing that needs fixing)

---
 OpenSim.RegionServer/world/Primitive2.cs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'OpenSim.RegionServer/world/Primitive2.cs')

diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 0df3079..5e76fd1 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -45,7 +45,17 @@ namespace OpenSim.world
                 this._physActor = value;
             }
         }
-
+        public override LLVector3 Pos
+        {
+            get
+            {
+                return base.Pos;
+            }
+            set
+            {
+                base.Pos = value;
+            }
+        }
         #endregion
 
         public Primitive2(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, World world)
@@ -106,6 +116,11 @@ namespace OpenSim.world
 
         #region Packet handlers
 
+        public void UpdatePosition(LLVector3 pos)
+        {
+
+        }
+
         public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
         {
             this.primData.PathBegin = addPacket.PathBegin;
@@ -230,6 +245,7 @@ namespace OpenSim.world
 
         #region Update viewers Methods
 
+        //should change these mehtods, so that outgoing packets are sent through the avatar class
         public void SendFullUpdateToClient(SimClient remoteClient)
         {
             LLVector3 lPos;
@@ -346,7 +362,7 @@ namespace OpenSim.world
             objdata.ObjectData[47] = 63;
         }
 
-        protected void UpdatePacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData)
+        protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData)
         {
             objectData.OwnerID = this.primData.OwnerID;
             objectData.PCode = this.primData.PCode;
@@ -378,7 +394,7 @@ namespace OpenSim.world
             ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
             this.SetDefaultPacketValues(objupdate);
             objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
-            this.UpdatePacketShapeData(objupdate);
+            this.SetPacketShapeData(objupdate);
             byte[] pb = this.Pos.GetBytes();
             Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length);
             return objupdate;
-- 
cgit v1.1