1 files changed, 29 insertions, 195 deletions

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 4661a90..5e4a3d3 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -17,7 +17,7 @@ using OpenSim.RegionServer.world.scripting.Scripts;
 

 namespace OpenSim.world

 {

-    public class World : ILocalStorageReceiver

+    public partial class World : ILocalStorageReceiver

     {

         public object LockPhysicsEngine = new object();

         public Dictionary<libsecondlife.LLUUID, Entity> Entities;

@@ -86,10 +86,10 @@ namespace OpenSim.world
 

             if (this.m_scripts.TryGetValue(substring, out scriptFactory))

             {

-               //Console.WriteLine("added script");

+                //Console.WriteLine("added script");

                 this.AddScript(entity, scriptFactory());

             }

-           

+

         }

 

         public InventoryCache InventoryCache

@@ -208,7 +208,6 @@ namespace OpenSim.world
 

         public void RegenerateTerrain(float[] newMap)

         {

-

             this.LandMap = newMap;

             lock (this.LockPhysicsEngine)

             {

@@ -309,8 +308,8 @@ namespace OpenSim.world
 

             Packet layerpack = TerrainManager.CreateLandPacket(LandMap, patches);

             RemoteClient.OutPacket(layerpack);

-

         }

+

         public void GetInitialPrims(SimClient RemoteClient)

         {

             foreach (libsecondlife.LLUUID UUID in Entities.Keys)

@@ -323,19 +322,38 @@ namespace OpenSim.world
             }

         }

 

-        public void AddViewerAgent(SimClient AgentClient)

+        public void AddViewerAgent(SimClient agentClient)

         {

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

-            Avatar NewAvatar = new Avatar(AgentClient, this, m_regionName, m_clientThreads, m_regionHandle);

+            Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle);

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");

-            NewAvatar.SendRegionHandshake(this);

-            PhysicsVector pVec = new PhysicsVector(NewAvatar.Pos.X, NewAvatar.Pos.Y, NewAvatar.Pos.Z);

+            newAvatar.SendRegionHandshake(this);

+            PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);

             lock (this.LockPhysicsEngine)

             {

-                NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec);

+                newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);

+            }

+            lock (Entities)

+            {

+                this.Entities.Add(agentClient.AgentID, newAvatar);

+            }

+            lock (Avatars)

+            {

+                this.Avatars.Add(agentClient.AgentID, newAvatar);

+            }

+        }

+

+        public void RemoveViewerAgent(SimClient agentClient)

+        {

+            lock (Entities)

+            {

+                Entities.Remove(agentClient.AgentID);

+            }

+            lock (Avatars)

+            {

+                Avatars.Remove(agentClient.AgentID);

             }

-            this.Entities.Add(AgentClient.AgentID, NewAvatar);

         }

 

         public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient)

@@ -357,94 +375,6 @@ namespace OpenSim.world
             this._primCount++;

         }

 

-        public bool DeRezObject(SimClient simClient, Packet packet)

-        {

-            DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;

-            // 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)

-                {

-

-                    //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

-            {

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

-                {

-                    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(simClient, DeRezPacket.AgentBlock.DestinationID, primAsset);

-                            selectedEnt = ent;

-                            break;

-                        }

-                    }

-                    if (selectedEnt != null)

-                    {

-                        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 = selectedEnt.localid;

-                        foreach (SimClient client in m_clientThreads.Values)

-                        {

-                            client.OutPacket(kill);

-                        }

-                        lock (Entities)

-                        {

-                            Entities.Remove(selectedEnt.uuid);

-                        }

-                    }

-                }

-            }

-            return true;

-        }

-

         public bool Backup()

         {

 

@@ -456,100 +386,6 @@ namespace OpenSim.world
             return true;

         }

 

-        #region Packet Handlers

-        public bool ModifyTerrain(SimClient simClient, Packet packet)

-        {

-            ModifyLandPacket modify = (ModifyLandPacket)packet;

-

-            switch (modify.ModifyBlock.Action)

-            {

-                case 1:

-                    // raise terrain

-                    if (modify.ParcelData.Length > 0)

-                    {

-                        int mody = (int)modify.ParcelData[0].North;

-                        int modx = (int)modify.ParcelData[0].West;

-                        lock (LandMap)

-                        {

-                            LandMap[(mody * 256) + modx - 1] += 0.05f;

-                            LandMap[(mody * 256) + modx] += 0.1f;

-                            LandMap[(mody * 256) + modx + 1] += 0.05f;

-                            LandMap[((mody + 1) * 256) + modx] += 0.05f;

-                            LandMap[((mody - 1) * 256) + modx] += 0.05f;

-                        }

-                        RegenerateTerrain(true, modx, mody);

-                    }

-                    break;

-                case 2:

-                    //lower terrain

-                    if (modify.ParcelData.Length > 0)

-                    {

-                        int mody = (int)modify.ParcelData[0].North;

-                        int modx = (int)modify.ParcelData[0].West;

-                        lock (LandMap)

-                        {

-                            LandMap[(mody * 256) + modx - 1] -= 0.05f;

-                            LandMap[(mody * 256) + modx] -= 0.1f;

-                            LandMap[(mody * 256) + modx + 1] -= 0.05f;

-                            LandMap[((mody + 1) * 256) + modx] -= 0.05f;

-                            LandMap[((mody - 1) * 256) + modx] -= 0.05f;

-                        }

-                        RegenerateTerrain(true, modx, mody);

-                    }

-                    break;

-            }

-            return true;

-        }

-

-        public bool SimChat(SimClient simClient, Packet packet)

-        {

-            System.Text.Encoding enc = System.Text.Encoding.ASCII;

-            ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)packet;

-            if (Helpers.FieldToString(inchatpack.ChatData.Message) == "")

-            {

-                //empty message so don't bother with it

-                return true;

-            }

-

-            libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();

-            reply.ChatData.Audible = 1;

-            reply.ChatData.Message = inchatpack.ChatData.Message;

-            reply.ChatData.ChatType = 1;

-            reply.ChatData.SourceType = 1;

-            reply.ChatData.Position = simClient.ClientAvatar.Pos;

-            reply.ChatData.FromName = enc.GetBytes(simClient.ClientAvatar.firstname + " " + simClient.ClientAvatar.lastname + "\0");

-            reply.ChatData.OwnerID = simClient.AgentID;

-            reply.ChatData.SourceID = simClient.AgentID;

-            foreach (SimClient client in m_clientThreads.Values)

-            {

-                client.OutPacket(reply);

-            }

-            return true;

-        }

-

-        public bool RezObject(SimClient simClient, Packet packet)

-        {

-            RezObjectPacket rezPacket = (RezObjectPacket)packet;

-            AgentInventory inven = this._inventoryCache.GetAgentsInventory(simClient.AgentID);

-            if (inven != null)

-            {

-                if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))

-                {

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

-                    if (asset != null)

-                    {

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

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

-                        nPrim.CreateFromStorage(primd, rezPacket.RezData.RayEnd, this._primCount, true);

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

-                        this._primCount++;

-                        this._inventoryCache.DeleteInventoryItem(simClient, rezPacket.InventoryData.ItemID);

-                    }

-                }

-            }

-            return true;

-        }

-

         public void SetDefaultScripts()

         {

             this.m_scripts.Add("FollowRandomAvatar", delegate()

@@ -558,7 +394,5 @@ namespace OpenSim.world
                                                              });

         }

 

-

-        #endregion

     }

 }