1 files changed, 26 insertions, 21 deletions

diff --git a/src/world/World.cs b/OpenSim.RegionServer/world/World.cs
index e1c84bc..ba99233 100644
--- a/src/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -5,8 +5,10 @@ using System.Collections.Generic;
 using System.Text;

 using System.Reflection;

 using System.IO;

-using PhysicsSystem;

-using GridInterfaces;

+using OpenSim.Physics.Manager;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Assets;

+using OpenSim.Framework.Terrain;

 

 namespace OpenSim.world

 {

@@ -26,10 +28,10 @@ namespace OpenSim.world
 

         public World()

         {

-                ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");

                 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();

 

-                ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating LandMap");

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");

                 TerrainManager = new TerrainManager(new SecondLife());

                 Avatar.SetupTemplate("avatar-template.dat");

         //      ServerConsole.MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");

@@ -71,7 +73,7 @@ namespace OpenSim.world
                 

                 //backup world data

                 this.storageCount++;

-                        if(storageCount> 300) //set to how often you want to backup 

+                        if(storageCount> 1200) //set to how often you want to backup 

                         {

                                 this.Backup();

                                 storageCount =0;

@@ -112,15 +114,15 @@ namespace OpenSim.world
                 HeightmapGenHills hills = new HeightmapGenHills();

                 this.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);

                 this.phyScene.SetTerrain(this.LandMap);

-                OpenSim_Main.cfg.SaveMap();

+                OpenSimRoot.Instance.Cfg.SaveMap(this.LandMap);

                 

-                foreach(OpenSimClient client in OpenSim_Main.sim.ClientThreads.Values) {

+                foreach(SimClient client in OpenSimRoot.Instance.ClientThreads.Values) {

                         this.SendLayerData(client);

                 }

         }

         public void LoadPrimsFromStorage()

         {

-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");

                 this.localStorage.LoadPrimitives(this);

         }

         

@@ -130,7 +132,7 @@ namespace OpenSim.world
                 {

                         _primCount = prim.LocalID + 1;

                 }

-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage");

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage");

                 Primitive nPrim = new Primitive();

                 nPrim.CreateFromStorage(prim);

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

@@ -141,7 +143,7 @@ namespace OpenSim.world
                 this.localStorage.ShutDown();

         }

         

-        public void SendLayerData(OpenSimClient RemoteClient) {

+        public void SendLayerData(SimClient RemoteClient) {

                 int[] patches = new int[4];

 

                 for (int y = 0; y < 16; y++)

@@ -159,7 +161,7 @@ namespace OpenSim.world
                 }

         }

         

-        public void GetInitialPrims(OpenSimClient RemoteClient)

+        public void GetInitialPrims(SimClient RemoteClient)

         {

                 foreach (libsecondlife.LLUUID UUID in Entities.Keys)

                 {

@@ -170,33 +172,36 @@ namespace OpenSim.world
                 }

         }

 

-        public void AddViewerAgent(OpenSimClient AgentClient) {

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

+        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);

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

-                ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");

+                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.position.X, NewAvatar.position.Y, NewAvatar.position.Z);

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

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

         }

         

-        public void AddNewPrim(ObjectAddPacket addPacket, OpenSimClient AgentClient)

+        public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient)

         {

-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");

                 Primitive prim = new Primitive();

                 prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount);

                 PhysicsVector pVec = new PhysicsVector(prim.position.X, prim.position.Y, prim.position.Z);

-                PhysicsVector pSize = new PhysicsVector( 0.25f, 0.25f, 0.25f);

-                //prim.PhysActor = this.phyScene.AddPrim(pVec, pSize );

+                PhysicsVector pSize = new PhysicsVector( 0.255f, 0.255f, 0.255f);

+                if(OpenSim.world.Avatar.PhysicsEngineFlying)

+                {

+                        prim.PhysActor = this.phyScene.AddPrim(pVec, pSize );

+                }

                 //prim.PhysicsEnabled = true;

                 this.Entities.Add(prim.uuid, prim);

                 this._primCount++;

         }

 

         public bool Backup() {

-                /* TODO: Save the current world entities state. */

-                ServerConsole.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");

+        

+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");

                 foreach (libsecondlife.LLUUID UUID in Entities.Keys)

                 {

                         Entities[UUID].BackUp();