From f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 25 Apr 2007 13:03:48 +0000
Subject: Small clean up of files and directories

---
 OpenSim.RegionServer/world/Primitive.cs           |  2 +-
 OpenSim.RegionServer/world/Primitive2.cs          |  2 +-
 OpenSim.RegionServer/world/ScriptEngine.cs        | 18 ------------------
 OpenSim.RegionServer/world/SurfacePatch.cs        | 22 ----------------------
 OpenSim.RegionServer/world/World.cs               |  6 +++---
 OpenSim.RegionServer/world/WorldPacketHandlers.cs |  2 +-
 OpenSim.RegionServer/world/WorldScripting.cs      |  1 +
 OpenSim.RegionServer/world/scripting/IScript.cs   | 16 ----------------
 8 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 OpenSim.RegionServer/world/ScriptEngine.cs
 delete mode 100644 OpenSim.RegionServer/world/SurfacePatch.cs
 delete mode 100644 OpenSim.RegionServer/world/scripting/IScript.cs

(limited to 'OpenSim.RegionServer/world')

diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index 6fb5d72..6124248 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -6,7 +6,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Physics.Manager;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.world
 {
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 616dc25..34e32f8 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -6,7 +6,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Physics.Manager;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 
 namespace OpenSim.world
diff --git a/OpenSim.RegionServer/world/ScriptEngine.cs b/OpenSim.RegionServer/world/ScriptEngine.cs
deleted file mode 100644
index f20a08e..0000000
--- a/OpenSim.RegionServer/world/ScriptEngine.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.world
-{
-    public class ScriptEngine
-    {
-        public ScriptEngine(World env)
-        {
-        }
-
-        public void LoadScript()
-        {
-
-        }
-    }
-}
diff --git a/OpenSim.RegionServer/world/SurfacePatch.cs b/OpenSim.RegionServer/world/SurfacePatch.cs
deleted file mode 100644
index 71e4116..0000000
--- a/OpenSim.RegionServer/world/SurfacePatch.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.world
-{
-    public class SurfacePatch
-    {
-    	public float[] HeightMap;
-
-	public SurfacePatch() {
-		HeightMap = new float[16*16];
-		
-		int xinc;
-            	int yinc;
-		for(xinc=0; xinc<16; xinc++) for(yinc=0; yinc<16; yinc++) {
-			HeightMap[xinc+(yinc*16)]=100.0f;
-		}
-					
-	}
-    }
-}
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index e0f2e6f..69a6494 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -8,11 +8,11 @@ using System.IO;
 using System.Threading;
 using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Terrain;
 using OpenSim.Framework.Inventory;
 using OpenSim.Assets;
-using OpenSim.world.scripting;
+//using OpenSim.world.scripting;
 using OpenSim.RegionServer.world.scripting;
 using OpenSim.RegionServer.world.scripting.Scripts;
 using OpenSim.Terrain;
@@ -25,7 +25,7 @@ namespace OpenSim.world
         public Dictionary<libsecondlife.LLUUID, Entity> Entities;
         public Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
         public Dictionary<libsecondlife.LLUUID, Primitive> Prims;
-        public ScriptEngine Scripts;
+        //public ScriptEngine Scripts;
         public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
         public uint _localNumber = 0;
         private PhysicsScene phyScene;
diff --git a/OpenSim.RegionServer/world/WorldPacketHandlers.cs b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
index 0643a4e..70cbc6b 100644
--- a/OpenSim.RegionServer/world/WorldPacketHandlers.cs
+++ b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
@@ -5,7 +5,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Terrain;
 using OpenSim.Framework.Inventory;
 using OpenSim.Assets;
diff --git a/OpenSim.RegionServer/world/WorldScripting.cs b/OpenSim.RegionServer/world/WorldScripting.cs
index 2f85869..44ef05a 100644
--- a/OpenSim.RegionServer/world/WorldScripting.cs
+++ b/OpenSim.RegionServer/world/WorldScripting.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Reflection;
 using OpenSim.Framework;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
 using libsecondlife;
 
 namespace OpenSim.world
diff --git a/OpenSim.RegionServer/world/scripting/IScript.cs b/OpenSim.RegionServer/world/scripting/IScript.cs
deleted file mode 100644
index 550594d..0000000
--- a/OpenSim.RegionServer/world/scripting/IScript.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.world.scripting
-{
-    public interface IScriptHost {
-        bool Register(IScript iscript);
-    }
-    public interface IScript
-    {
-        string Name{get;set;}
-        IScriptHost Host{get;set;}
-        void Show();
-    }
-}
-- 
cgit v1.1