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/AgentAssetUpload.cs | 2 +- OpenSim.RegionServer/Assets/AssetCache.cs | 2 +- OpenSim.RegionServer/Assets/InventoryCache.cs | 6 +++--- OpenSim.RegionServer/ConsoleCmds.cs | 0 OpenSim.RegionServer/OpenSim.RegionServer.csproj | 15 --------------- .../OpenSim.RegionServer.dll.build | 5 ----- OpenSim.RegionServer/OpenSimMain.cs | 22 ++++++++++++---------- OpenSim.RegionServer/SimClient.cs | 2 +- OpenSim.RegionServer/SimConsole.cs | 0 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 ---------------- 17 files changed, 25 insertions(+), 98 deletions(-) delete mode 100644 OpenSim.RegionServer/ConsoleCmds.cs delete mode 100644 OpenSim.RegionServer/SimConsole.cs 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') diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs index 998a9db..258bda0 100644 --- a/OpenSim.RegionServer/AgentAssetUpload.cs +++ b/OpenSim.RegionServer/AgentAssetUpload.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; using OpenSim.Assets; -using OpenSim.Framework.Assets; +using OpenSim.Framework.Types; using OpenSim.Framework.Utilities; using libsecondlife; using libsecondlife.Packets; diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs index 573e5fd..e217d78 100644 --- a/OpenSim.RegionServer/Assets/AssetCache.cs +++ b/OpenSim.RegionServer/Assets/AssetCache.cs @@ -32,7 +32,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Assets; +using OpenSim.Framework.Types; using OpenSim.Framework.Utilities; namespace OpenSim.Assets diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs index a50bb2b..136ae53 100644 --- a/OpenSim.RegionServer/Assets/InventoryCache.cs +++ b/OpenSim.RegionServer/Assets/InventoryCache.cs @@ -32,7 +32,7 @@ using OpenSim; using libsecondlife.Packets; //using OpenSim.GridServers; using OpenSim.Framework.Inventory; -using OpenSim.Framework.Assets; +using OpenSim.Framework.Types; using OpenSim.Framework.Interfaces; namespace OpenSim.Assets @@ -125,7 +125,7 @@ namespace OpenSim.Assets return res; } - public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Assets.AssetBase asset) + public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset) { LLUUID newItem = null; if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) @@ -161,7 +161,7 @@ namespace OpenSim.Assets return res; } - public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset) + public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset) { if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) { diff --git a/OpenSim.RegionServer/ConsoleCmds.cs b/OpenSim.RegionServer/ConsoleCmds.cs deleted file mode 100644 index e69de29..0000000 diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 2dcee6a..ae391a9 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -121,9 +121,6 @@ Code - - Code - Code @@ -145,9 +142,6 @@ Code - - Code - Code @@ -187,12 +181,6 @@ Code - - Code - - - Code - Code @@ -202,9 +190,6 @@ Code - - Code - Code diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index ac93c19..abd7776 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -12,7 +12,6 @@ - @@ -20,7 +19,6 @@ - @@ -34,12 +32,9 @@ - - - diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 151ac51..e3e9b98 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs @@ -41,6 +41,7 @@ using libsecondlife.Packets; using OpenSim.world; using OpenSim.Terrain; using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Types; using OpenSim.UserServer; using OpenSim.Assets; using OpenSim.CAPS; @@ -82,7 +83,7 @@ namespace OpenSim public string m_physicsEngine; public bool m_sandbox = false; public bool m_loginserver; - public OpenGridProtocolServer OGSServer; + public OpenGridProtocolServer OGSServer; public bool user_accounts = false; public bool gridLocalAsset = false; @@ -205,8 +206,8 @@ namespace OpenSim if (gridServer.GetName() == "Remote") { - // should startup the OGS protocol server here - OGSServer = new OpenGridProtocolServer(8500); + // should startup the OGS protocol server here + //OGSServer = new OpenGridProtocolServer(8500); // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server httpServer.AddXmlRPCHandler("expect_user", @@ -298,12 +299,13 @@ namespace OpenSim m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); httpServer.Start(); - - if(gridServer.GetName() == "Remote") { - m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server"); - OGSServer.Start(); - } - + + if (gridServer.GetName() == "Remote") + { + m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server"); + OGSServer.Start(); + } + MainServerListener(); m_heartbeatTimer.Enabled = true; @@ -523,7 +525,7 @@ namespace OpenSim case "terrain": string result = ""; - if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams,ref result)) + if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result)) { m_console.WriteLine(result); } diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 4b4132e..9a0a6eb 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs @@ -36,7 +36,7 @@ using System.IO; using System.Threading; using System.Timers; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Assets; +using OpenSim.Framework.Types; using OpenSim.Framework.Inventory; using OpenSim.Framework.Utilities; using OpenSim.world; diff --git a/OpenSim.RegionServer/SimConsole.cs b/OpenSim.RegionServer/SimConsole.cs deleted file mode 100644 index e69de29..0000000 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 Entities; public Dictionary Avatars; public Dictionary 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