2 files changed, 193 insertions, 32 deletions

diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index 2f97053..2c55004 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -27,6 +27,7 @@ namespace OpenSim.world
         private Dictionary<uint, SimClient> m_clientThreads;

         private ulong m_regionHandle;

         private World m_world;

+        private const uint FULL_MASK_PERMISSIONS = 2147483647;

 

         public bool PhysicsEnabled

         {

@@ -94,6 +95,40 @@ namespace OpenSim.world
             return mesh;

         }

 

+        public byte[] GetByteArray()

+        {

+            return this.primData.ToBytes();

+        }

+

+        public void GetProperites(SimClient client)

+        {

+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();

+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];

+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();

+            proper.ObjectData[0].ItemID = LLUUID.Zero; // this.uuid;

+            proper.ObjectData[0].CreationDate = (ulong) this.primData.CreationDate;

+            proper.ObjectData[0].CreatorID = this.primData.OwnerID;

+            proper.ObjectData[0].FolderID = LLUUID.Zero;

+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;

+            proper.ObjectData[0].GroupID = LLUUID.Zero;

+            proper.ObjectData[0].InventorySerial = 0;

+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;

+            proper.ObjectData[0].ObjectID = this.uuid;

+            proper.ObjectData[0].OwnerID = primData.OwnerID;

+            proper.ObjectData[0].TouchName = new byte[0];

+            proper.ObjectData[0].TextureID = new byte[0];

+            proper.ObjectData[0].SitName = new byte[0];

+            proper.ObjectData[0].Name = new byte[0];

+            proper.ObjectData[0].Description = new byte[0];

+            proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;

+            proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;

+            proper.ObjectData[0].GroupMask = this.primData.GroupMask;

+            proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;

+            proper.ObjectData[0].BaseMask = this.primData.BaseMask;

+            

+            client.OutPacket(proper);

+        }

+

         public void UpdatePosition(LLVector3 pos)

         {

             this.position = pos;

@@ -125,9 +160,45 @@ namespace OpenSim.world
             }

             if (this.newPrimFlag)

             {

+              /*  ObjectOwnerPacket objown = new ObjectOwnerPacket();

+                objown.HeaderData.GroupID = LLUUID.Zero;

+                objown.HeaderData.Override = false;

+                objown.HeaderData.OwnerID = LLUUID.Zero;

+                objown.ObjectData = new ObjectOwnerPacket.ObjectDataBlock[1];

+                objown.ObjectData[0] = new ObjectOwnerPacket.ObjectDataBlock();

+                objown.ObjectData[0].ObjectLocalID = this.localid;

+                ObjectGroupPacket objgroup = new ObjectGroupPacket();

+                objgroup.ObjectData = new ObjectGroupPacket.ObjectDataBlock[1];

+                objgroup.ObjectData[0] = new ObjectGroupPacket.ObjectDataBlock();

+                objgroup.ObjectData[0].ObjectLocalID = this.localid;

+                ObjectPermissionsPacket objper = new ObjectPermissionsPacket();

+                objper.HeaderData.Override = false;

+                objper.ObjectData = new ObjectPermissionsPacket.ObjectDataBlock[3];

+                for (int i = 0; i < 3; i++)

+                {

+                    objper.ObjectData[i] = new ObjectPermissionsPacket.ObjectDataBlock();

+                    objper.ObjectData[i].ObjectLocalID = this.localid;

+                    objper.ObjectData[i].Set = 1;

+                    objper.ObjectData[i].Field = 0;

+                }

+                objper.ObjectData[0].Mask = 8192;

+                objper.ObjectData[1].Mask = 16384;

+                objper.ObjectData[2].Mask = 32768;*/

+                

                 foreach (SimClient client in m_clientThreads.Values)

                 {

                     client.OutPacket(OurPacket);

+                   /* objown.AgentData.AgentID = client.AgentID;

+                    objown.AgentData.SessionID = client.SessionID;

+                    objown.HeaderData.OwnerID = client.AgentID;

+                    client.OutPacket(objown);

+                    objgroup.AgentData.AgentID = client.AgentID;

+                    objgroup.AgentData.GroupID = LLUUID.Zero;

+                    objgroup.AgentData.SessionID = client.SessionID;

+                    client.OutPacket(objgroup);

+                    objper.AgentData.AgentID = client.AgentID;

+                    objper.AgentData.SessionID = client.SessionID;

+                    client.OutPacket(objper);*/

                 }

                 this.newPrimFlag = false;

             }

@@ -286,18 +357,18 @@ namespace OpenSim.world
         {

             ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

             objupdate.RegionData.RegionHandle = m_regionHandle;

-            objupdate.RegionData.TimeDilation = 64096;

+            objupdate.RegionData.TimeDilation = 64096; 

 

             objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];

             PrimData PData = new PrimData();

             this.primData = PData;

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

+           

             objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();

             objupdate.ObjectData[0].PSBlock = new byte[0];

             objupdate.ObjectData[0].ExtraParams = new byte[1];

             objupdate.ObjectData[0].MediaURL = new byte[0];

-            objupdate.ObjectData[0].NameValue = new byte[2];

-            objupdate.ObjectData[0].NameValue[0] = (byte)'t';

-            objupdate.ObjectData[0].NameValue[1] = (byte)'o';

+            objupdate.ObjectData[0].NameValue = new byte[0];

             objupdate.ObjectData[0].Text = new byte[0];

             objupdate.ObjectData[0].TextColor = new byte[4];

             objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);

@@ -307,7 +378,7 @@ namespace OpenSim.world
             objupdate.ObjectData[0].TextureAnim = new byte[0];

             objupdate.ObjectData[0].Sound = LLUUID.Zero;

             LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));

-            objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();

+            this.primData.Texture = objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();

             objupdate.ObjectData[0].State = 0;

             objupdate.ObjectData[0].Data = new byte[0];

             PData.OwnerID = objupdate.ObjectData[0].OwnerID = agentID;

@@ -326,14 +397,12 @@ namespace OpenSim.world
             PData.ProfileCurve = objupdate.ObjectData[0].ProfileCurve = addPacket.ObjectData.ProfileCurve;

             PData.ParentID = objupdate.ObjectData[0].ParentID = 0;

             PData.ProfileHollow = objupdate.ObjectData[0].ProfileHollow = addPacket.ObjectData.ProfileHollow;

-

             PData.PathRadiusOffset = objupdate.ObjectData[0].PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;

             PData.PathRevolutions = objupdate.ObjectData[0].PathRevolutions = addPacket.ObjectData.PathRevolutions;

             PData.PathTaperX = objupdate.ObjectData[0].PathTaperX = addPacket.ObjectData.PathTaperX;

             PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY;

             PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;

             PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;

-

             objupdate.ObjectData[0].ID = (uint)(localID);

             objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000"));

             objupdate.ObjectData[0].ObjectData = new byte[60];

@@ -343,16 +412,20 @@ namespace OpenSim.world
             //update position

             byte[] pb = pos1.GetBytes();

             Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);

-

             this.newPrimFlag = true;

-            this.uuid = objupdate.ObjectData[0].FullID;

+            this.primData.FullID = this.uuid = objupdate.ObjectData[0].FullID;

             this.localid = objupdate.ObjectData[0].ID;

-            this.position = pos1;

+            this.primData.Position =  this.position = pos1;

             this.OurPacket = objupdate;

         }

 

         public void CreateFromStorage(PrimData store)

         {

+            this.CreateFromStorage(store, store.Position, store.LocalID, false);

+        }

+

+        public void CreateFromStorage(PrimData store, LLVector3 posi, uint localID, bool newprim)

+        {

             //need to clean this up as it shares a lot of code with CreateFromPacket()

             ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

             objupdate.RegionData.RegionHandle = m_regionHandle;

@@ -410,13 +483,13 @@ namespace OpenSim.world
             objupdate.ObjectData[0].PathTwist = this.primData.PathTwist;

             objupdate.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;

 

-            objupdate.ObjectData[0].ID = (uint)store.LocalID;

+            objupdate.ObjectData[0].ID = localID; // (uint)store.LocalID;

             objupdate.ObjectData[0].FullID = store.FullID;

 

             objupdate.ObjectData[0].ObjectData = new byte[60];

             objupdate.ObjectData[0].ObjectData[46] = 128;

             objupdate.ObjectData[0].ObjectData[47] = 63;

-            LLVector3 pos1 = store.Position;

+            LLVector3 pos1 = posi; // store.Position;

             //update position

             byte[] pb = pos1.GetBytes();

             Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);

@@ -425,8 +498,12 @@ namespace OpenSim.world
             this.localid = objupdate.ObjectData[0].ID;

             this.position = pos1;

             this.OurPacket = objupdate;

-

+            if (newprim)

+            {

+                this.newPrimFlag = true;

+            }

         }

+

         public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()

         {

             uint ID = this.localid;

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 446d37c..82e8b8d 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -9,6 +9,8 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Assets;

 using OpenSim.Framework.Terrain;

+using OpenSim.Framework.Inventory;

+using OpenSim.Assets;

 

 namespace OpenSim.world

 {

@@ -30,6 +32,8 @@ namespace OpenSim.world
         private ulong m_regionHandle;

         private string m_regionName;

         private SimConfig m_cfg;

+        private InventoryCache _inventoryCache;

+        private AssetCache _assetCache;

 

         public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName, SimConfig cfg)

         {

@@ -50,6 +54,21 @@ namespace OpenSim.world
             Avatar.LoadAnims();

         }

 

+        public InventoryCache InventoryCache

+        {

+            set

+            {

+                this._inventoryCache = value;

+            }

+        }

+

+        public AssetCache AssetCache

+        {

+            set

+            {

+                this._assetCache = value;

+            }

+        }

         public PhysicsScene PhysScene

         {

             set

@@ -291,44 +310,109 @@ namespace OpenSim.world
 

         public void DeRezObject(DeRezObjectPacket DeRezPacket, SimClient AgentClient)

         {

+           // Console.WriteLine(DeRezPacket);

             //Needs to delete object from physics at a later date

+            if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)

+            {

+                libsecondlife.LLUUID[] DeRezEnts;

+                DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length];

+                int i = 0;

+                foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)

+                {

 

-            libsecondlife.LLUUID[] DeRezEnts;

-            DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length];

-            int i = 0;

-            foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)

+                    //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());

+                    foreach (Entity ent in this.Entities.Values)

+                    {

+                        if (ent.localid == Data.ObjectLocalID)

+                        {

+                            DeRezEnts[i++] = ent.uuid;

+                            this.localStorage.RemovePrim(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 m_clientThreads.Values)

+                            {

+                                client.OutPacket(kill);

+                            }

+                            //Uncommenting this means an old UUID will be re-used, thus crashing the asset server

+                            //Uncomment when prim/object UUIDs are random or such

+                            //2007-03-22 - Randomskk

+                            //this._primCount--;

+                            OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid);

+                        }

+                    }

+                }

+                foreach (libsecondlife.LLUUID uuid in DeRezEnts)

+                {

+                    lock (Entities)

+                    {

+                        Entities.Remove(uuid);

+                    }

+                }

+            }

+            else

             {

-                //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());

-                foreach (Entity ent in this.Entities.Values)

+                foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)

                 {

-                    if (ent.localid == Data.ObjectLocalID)

+                    Entity selectedEnt = null;

+                    //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());

+                    foreach (Entity ent in this.Entities.Values)

+                    {

+                        if (ent.localid == Data.ObjectLocalID)

+                        {

+                            AssetBase primAsset = new AssetBase();

+                            primAsset.FullID = LLUUID.Random();//DeRezPacket.AgentBlock.TransactionID.Combine(LLUUID.Zero); //should be combining with securesessionid

+                            primAsset.InvType = 6;

+                            primAsset.Type = 6;

+                            primAsset.Name = "Prim";

+                            primAsset.Description = "";

+                            primAsset.Data = ((Primitive)ent).GetByteArray();

+                            this._assetCache.AddAsset(primAsset);

+                            this._inventoryCache.AddNewInventoryItem(AgentClient, DeRezPacket.AgentBlock.DestinationID, primAsset);

+                            selectedEnt = ent;

+                            break;

+                        }

+                    }

+                    if (selectedEnt != null)

                     {

-                        DeRezEnts[i++] = ent.uuid;

-                        this.localStorage.RemovePrim(ent.uuid);

+                        this.localStorage.RemovePrim(selectedEnt.uuid);

                         KillObjectPacket kill = new KillObjectPacket();

                         kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];

                         kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();

-                        kill.ObjectData[0].ID = ent.localid;

+                        kill.ObjectData[0].ID = selectedEnt.localid;

                         foreach (SimClient client in m_clientThreads.Values)

                         {

                             client.OutPacket(kill);

                         }

-                        //Uncommenting this means an old UUID will be re-used, thus crashing the asset server

-                        //Uncomment when prim/object UUIDs are random or such

-                        //2007-03-22 - Randomskk

-                        //this._primCount--;

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid);

+                        lock (Entities)

+                        {

+                            Entities.Remove(selectedEnt.uuid);

+                        }

                     }

                 }

             }

-            foreach (libsecondlife.LLUUID uuid in DeRezEnts)

+        }

+

+        public void RezObject(SimClient remoteClient, RezObjectPacket packet)

+        {

+            AgentInventory inven =this._inventoryCache.GetAgentsInventory(remoteClient.AgentID);

+            if(inven != null)

             {

-                lock (Entities)

+                if (inven.InventoryItems.ContainsKey(packet.InventoryData.ItemID))

                 {

-                    Entities.Remove(uuid);

+                    AssetBase asset = this._assetCache.GetAsset(inven.InventoryItems[packet.InventoryData.ItemID].AssetID);

+                    if (asset != null)

+                    {

+                        PrimData primd = new PrimData(asset.Data);

+                        Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);

+                        nPrim.CreateFromStorage(primd, packet.RezData.RayEnd, this._primCount, true);

+                        this.Entities.Add(nPrim.uuid, nPrim);

+                        this._primCount++;

+                        this._inventoryCache.DeleteInventoryItem(remoteClient, packet.InventoryData.ItemID);

+                    }

                 }

             }

-

         }

 

         public bool Backup()