aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorMW2007-04-25 13:03:48 +0000
committerMW2007-04-25 13:03:48 +0000
commitf7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 (patch)
treeb9f8f1dac346906f1333aa3fc8da704466eda005 /OpenSim.RegionServer
parent* Added try{}catch{} to RunTerrainCmd (diff)
downloadopensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.zip
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.gz
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.bz2
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.xz
Small clean up of files and directories
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs2
-rw-r--r--OpenSim.RegionServer/Assets/AssetCache.cs2
-rw-r--r--OpenSim.RegionServer/Assets/InventoryCache.cs6
-rw-r--r--OpenSim.RegionServer/ConsoleCmds.cs0
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj15
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build5
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs22
-rw-r--r--OpenSim.RegionServer/SimClient.cs2
-rw-r--r--OpenSim.RegionServer/SimConsole.cs0
-rw-r--r--OpenSim.RegionServer/world/Primitive.cs2
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs2
-rw-r--r--OpenSim.RegionServer/world/ScriptEngine.cs18
-rw-r--r--OpenSim.RegionServer/world/SurfacePatch.cs22
-rw-r--r--OpenSim.RegionServer/world/World.cs6
-rw-r--r--OpenSim.RegionServer/world/WorldPacketHandlers.cs2
-rw-r--r--OpenSim.RegionServer/world/WorldScripting.cs1
-rw-r--r--OpenSim.RegionServer/world/scripting/IScript.cs16
17 files changed, 25 insertions, 98 deletions
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;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Assets; 4using OpenSim.Assets;
5using OpenSim.Framework.Assets; 5using OpenSim.Framework.Types;
6using OpenSim.Framework.Utilities; 6using OpenSim.Framework.Utilities;
7using libsecondlife; 7using libsecondlife;
8using libsecondlife.Packets; 8using 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;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim; 33using OpenSim;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Assets; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities; 36using OpenSim.Framework.Utilities;
37 37
38namespace OpenSim.Assets 38namespace 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;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33//using OpenSim.GridServers; 33//using OpenSim.GridServers;
34using OpenSim.Framework.Inventory; 34using OpenSim.Framework.Inventory;
35using OpenSim.Framework.Assets; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
37 37
38namespace OpenSim.Assets 38namespace OpenSim.Assets
@@ -125,7 +125,7 @@ namespace OpenSim.Assets
125 return res; 125 return res;
126 } 126 }
127 127
128 public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Assets.AssetBase asset) 128 public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
129 { 129 {
130 LLUUID newItem = null; 130 LLUUID newItem = null;
131 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 131 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
@@ -161,7 +161,7 @@ namespace OpenSim.Assets
161 return res; 161 return res;
162 } 162 }
163 163
164 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset) 164 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
165 { 165 {
166 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 166 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
167 { 167 {
diff --git a/OpenSim.RegionServer/ConsoleCmds.cs b/OpenSim.RegionServer/ConsoleCmds.cs
deleted file mode 100644
index e69de29..0000000
--- a/OpenSim.RegionServer/ConsoleCmds.cs
+++ /dev/null
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 @@
121 <Compile Include="AgentAssetUpload.cs"> 121 <Compile Include="AgentAssetUpload.cs">
122 <SubType>Code</SubType> 122 <SubType>Code</SubType>
123 </Compile> 123 </Compile>
124 <Compile Include="ConsoleCmds.cs">
125 <SubType>Code</SubType>
126 </Compile>
127 <Compile Include="Grid.cs"> 124 <Compile Include="Grid.cs">
128 <SubType>Code</SubType> 125 <SubType>Code</SubType>
129 </Compile> 126 </Compile>
@@ -145,9 +142,6 @@
145 <Compile Include="SimClient.cs"> 142 <Compile Include="SimClient.cs">
146 <SubType>Code</SubType> 143 <SubType>Code</SubType>
147 </Compile> 144 </Compile>
148 <Compile Include="SimConsole.cs">
149 <SubType>Code</SubType>
150 </Compile>
151 <Compile Include="VersionInfo.cs"> 145 <Compile Include="VersionInfo.cs">
152 <SubType>Code</SubType> 146 <SubType>Code</SubType>
153 </Compile> 147 </Compile>
@@ -187,12 +181,6 @@
187 <Compile Include="world\Primitive2.cs"> 181 <Compile Include="world\Primitive2.cs">
188 <SubType>Code</SubType> 182 <SubType>Code</SubType>
189 </Compile> 183 </Compile>
190 <Compile Include="world\ScriptEngine.cs">
191 <SubType>Code</SubType>
192 </Compile>
193 <Compile Include="world\SurfacePatch.cs">
194 <SubType>Code</SubType>
195 </Compile>
196 <Compile Include="world\World.cs"> 184 <Compile Include="world\World.cs">
197 <SubType>Code</SubType> 185 <SubType>Code</SubType>
198 </Compile> 186 </Compile>
@@ -202,9 +190,6 @@
202 <Compile Include="world\WorldScripting.cs"> 190 <Compile Include="world\WorldScripting.cs">
203 <SubType>Code</SubType> 191 <SubType>Code</SubType>
204 </Compile> 192 </Compile>
205 <Compile Include="world\scripting\IScript.cs">
206 <SubType>Code</SubType>
207 </Compile>
208 <Compile Include="world\scripting\IScriptContext.cs"> 193 <Compile Include="world\scripting\IScriptContext.cs">
209 <SubType>Code</SubType> 194 <SubType>Code</SubType>
210 </Compile> 195 </Compile>
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 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" /> 14 <include name="AgentAssetUpload.cs" />
15 <include name="ConsoleCmds.cs" />
16 <include name="Grid.cs" /> 15 <include name="Grid.cs" />
17 <include name="OpenSimMain.cs" /> 16 <include name="OpenSimMain.cs" />
18 <include name="OpenSimNetworkHandler.cs" /> 17 <include name="OpenSimNetworkHandler.cs" />
@@ -20,7 +19,6 @@
20 <include name="QueItem.cs" /> 19 <include name="QueItem.cs" />
21 <include name="RegionInfo.cs" /> 20 <include name="RegionInfo.cs" />
22 <include name="SimClient.cs" /> 21 <include name="SimClient.cs" />
23 <include name="SimConsole.cs" />
24 <include name="VersionInfo.cs" /> 22 <include name="VersionInfo.cs" />
25 <include name="Assets/AssetCache.cs" /> 23 <include name="Assets/AssetCache.cs" />
26 <include name="Assets/InventoryCache.cs" /> 24 <include name="Assets/InventoryCache.cs" />
@@ -34,12 +32,9 @@
34 <include name="world/Entity.cs" /> 32 <include name="world/Entity.cs" />
35 <include name="world/Primitive.cs" /> 33 <include name="world/Primitive.cs" />
36 <include name="world/Primitive2.cs" /> 34 <include name="world/Primitive2.cs" />
37 <include name="world/ScriptEngine.cs" />
38 <include name="world/SurfacePatch.cs" />
39 <include name="world/World.cs" /> 35 <include name="world/World.cs" />
40 <include name="world/WorldPacketHandlers.cs" /> 36 <include name="world/WorldPacketHandlers.cs" />
41 <include name="world/WorldScripting.cs" /> 37 <include name="world/WorldScripting.cs" />
42 <include name="world/scripting/IScript.cs" />
43 <include name="world/scripting/IScriptContext.cs" /> 38 <include name="world/scripting/IScriptContext.cs" />
44 <include name="world/scripting/IScriptEntity.cs" /> 39 <include name="world/scripting/IScriptEntity.cs" />
45 <include name="world/scripting/IScriptHandler.cs" /> 40 <include name="world/scripting/IScriptHandler.cs" />
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;
41using OpenSim.world; 41using OpenSim.world;
42using OpenSim.Terrain; 42using OpenSim.Terrain;
43using OpenSim.Framework.Interfaces; 43using OpenSim.Framework.Interfaces;
44using OpenSim.Framework.Types;
44using OpenSim.UserServer; 45using OpenSim.UserServer;
45using OpenSim.Assets; 46using OpenSim.Assets;
46using OpenSim.CAPS; 47using OpenSim.CAPS;
@@ -82,7 +83,7 @@ namespace OpenSim
82 public string m_physicsEngine; 83 public string m_physicsEngine;
83 public bool m_sandbox = false; 84 public bool m_sandbox = false;
84 public bool m_loginserver; 85 public bool m_loginserver;
85 public OpenGridProtocolServer OGSServer; 86 public OpenGridProtocolServer OGSServer;
86 public bool user_accounts = false; 87 public bool user_accounts = false;
87 public bool gridLocalAsset = false; 88 public bool gridLocalAsset = false;
88 89
@@ -205,8 +206,8 @@ namespace OpenSim
205 206
206 if (gridServer.GetName() == "Remote") 207 if (gridServer.GetName() == "Remote")
207 { 208 {
208 // should startup the OGS protocol server here 209 // should startup the OGS protocol server here
209 OGSServer = new OpenGridProtocolServer(8500); 210 //OGSServer = new OpenGridProtocolServer(8500);
210 211
211 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 212 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
212 httpServer.AddXmlRPCHandler("expect_user", 213 httpServer.AddXmlRPCHandler("expect_user",
@@ -298,12 +299,13 @@ namespace OpenSim
298 299
299 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); 300 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
300 httpServer.Start(); 301 httpServer.Start();
301 302
302 if(gridServer.GetName() == "Remote") { 303 if (gridServer.GetName() == "Remote")
303 m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server"); 304 {
304 OGSServer.Start(); 305 m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
305 } 306 OGSServer.Start();
306 307 }
308
307 MainServerListener(); 309 MainServerListener();
308 310
309 m_heartbeatTimer.Enabled = true; 311 m_heartbeatTimer.Enabled = true;
@@ -523,7 +525,7 @@ namespace OpenSim
523 525
524 case "terrain": 526 case "terrain":
525 string result = ""; 527 string result = "";
526 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams,ref result)) 528 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
527 { 529 {
528 m_console.WriteLine(result); 530 m_console.WriteLine(result);
529 } 531 }
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;
36using System.Threading; 36using System.Threading;
37using System.Timers; 37using System.Timers;
38using OpenSim.Framework.Interfaces; 38using OpenSim.Framework.Interfaces;
39using OpenSim.Framework.Assets; 39using OpenSim.Framework.Types;
40using OpenSim.Framework.Inventory; 40using OpenSim.Framework.Inventory;
41using OpenSim.Framework.Utilities; 41using OpenSim.Framework.Utilities;
42using OpenSim.world; 42using OpenSim.world;
diff --git a/OpenSim.RegionServer/SimConsole.cs b/OpenSim.RegionServer/SimConsole.cs
deleted file mode 100644
index e69de29..0000000
--- a/OpenSim.RegionServer/SimConsole.cs
+++ /dev/null
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;
6using libsecondlife.Packets; 6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager; 8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Assets; 9using OpenSim.Framework.Types;
10 10
11namespace OpenSim.world 11namespace OpenSim.world
12{ 12{
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;
6using libsecondlife.Packets; 6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager; 8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Assets; 9using OpenSim.Framework.Types;
10using OpenSim.Framework.Inventory; 10using OpenSim.Framework.Inventory;
11 11
12namespace OpenSim.world 12namespace 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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.world
6{
7 public class ScriptEngine
8 {
9 public ScriptEngine(World env)
10 {
11 }
12
13 public void LoadScript()
14 {
15
16 }
17 }
18}
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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.world
6{
7 public class SurfacePatch
8 {
9 public float[] HeightMap;
10
11 public SurfacePatch() {
12 HeightMap = new float[16*16];
13
14 int xinc;
15 int yinc;
16 for(xinc=0; xinc<16; xinc++) for(yinc=0; yinc<16; yinc++) {
17 HeightMap[xinc+(yinc*16)]=100.0f;
18 }
19
20 }
21 }
22}
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;
8using System.Threading; 8using System.Threading;
9using OpenSim.Physics.Manager; 9using OpenSim.Physics.Manager;
10using OpenSim.Framework.Interfaces; 10using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Assets; 11using OpenSim.Framework.Types;
12using OpenSim.Framework.Terrain; 12using OpenSim.Framework.Terrain;
13using OpenSim.Framework.Inventory; 13using OpenSim.Framework.Inventory;
14using OpenSim.Assets; 14using OpenSim.Assets;
15using OpenSim.world.scripting; 15//using OpenSim.world.scripting;
16using OpenSim.RegionServer.world.scripting; 16using OpenSim.RegionServer.world.scripting;
17using OpenSim.RegionServer.world.scripting.Scripts; 17using OpenSim.RegionServer.world.scripting.Scripts;
18using OpenSim.Terrain; 18using OpenSim.Terrain;
@@ -25,7 +25,7 @@ namespace OpenSim.world
25 public Dictionary<libsecondlife.LLUUID, Entity> Entities; 25 public Dictionary<libsecondlife.LLUUID, Entity> Entities;
26 public Dictionary<libsecondlife.LLUUID, Avatar> Avatars; 26 public Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
27 public Dictionary<libsecondlife.LLUUID, Primitive> Prims; 27 public Dictionary<libsecondlife.LLUUID, Primitive> Prims;
28 public ScriptEngine Scripts; 28 //public ScriptEngine Scripts;
29 public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. 29 public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
30 public uint _localNumber = 0; 30 public uint _localNumber = 0;
31 private PhysicsScene phyScene; 31 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;
5using libsecondlife.Packets; 5using libsecondlife.Packets;
6using OpenSim.Physics.Manager; 6using OpenSim.Physics.Manager;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Assets; 8using OpenSim.Framework.Types;
9using OpenSim.Framework.Terrain; 9using OpenSim.Framework.Terrain;
10using OpenSim.Framework.Inventory; 10using OpenSim.Framework.Inventory;
11using OpenSim.Assets; 11using 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;
5using System.Reflection; 5using System.Reflection;
6using OpenSim.Framework; 6using OpenSim.Framework;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
8using libsecondlife; 9using libsecondlife;
9 10
10namespace OpenSim.world 11namespace 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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.world.scripting
6{
7 public interface IScriptHost {
8 bool Register(IScript iscript);
9 }
10 public interface IScript
11 {
12 string Name{get;set;}
13 IScriptHost Host{get;set;}
14 void Show();
15 }
16}