aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2008-02-14 16:13:53 +0000
committerAdam Frisby2008-02-14 16:13:53 +0000
commit91d9248fcebfae4890e502c7140403f881b2a4d0 (patch)
treeda5222277d5ba451f943ecadcbb3393fcacaf589 /OpenSim/Region
parentFix a casting subtlety in moving to constants. Logins should work (diff)
downloadopensim-SC_OLD-91d9248fcebfae4890e502c7140403f881b2a4d0.zip
opensim-SC_OLD-91d9248fcebfae4890e502c7140403f881b2a4d0.tar.gz
opensim-SC_OLD-91d9248fcebfae4890e502c7140403f881b2a4d0.tar.bz2
opensim-SC_OLD-91d9248fcebfae4890e502c7140403f881b2a4d0.tar.xz
* Removed some catch-all-ignores from UDPServer in an attempt to look for #305.
* Minor work towards abstracting terrain.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs (renamed from OpenSim/Region/Environment/Modules/TerrainModule.cs)3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs2
3 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f9918ff..a7e0c22 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -189,9 +189,9 @@ namespace OpenSim.Region.ClientStack
189 189
190 return; 190 return;
191 } 191 }
192 catch (ObjectDisposedException) 192 catch (ObjectDisposedException e)
193 { 193 {
194 //m_log.Debug("[UDPSERVER]: " + e.ToString()); 194 m_log.Debug("[UDPSERVER]: " + e.ToString());
195 return; 195 return;
196 } 196 }
197 197
@@ -201,9 +201,9 @@ namespace OpenSim.Region.ClientStack
201 { 201 {
202 packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); 202 packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
203 } 203 }
204 catch (Exception) 204 catch (Exception e)
205 { 205 {
206 206 m_log.Debug("[UDPSERVER]: " + e.ToString());
207 } 207 }
208 208
209 if (packet != null) 209 if (packet != null)
diff --git a/OpenSim/Region/Environment/Modules/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 7e163a3..990a1e0 100644
--- a/OpenSim/Region/Environment/Modules/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -32,11 +32,12 @@ using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Modules;
35using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
37using libsecondlife; 38using libsecondlife;
38 39
39namespace OpenSim.Region.Environment.Modules 40namespace OpenSim.Region.Environment.Modules.Terrain
40{ 41{
41 /// <summary> 42 /// <summary>
42 /// A new version of the old Channel class, simplified 43 /// A new version of the old Channel class, simplified
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index e39fa9f..4e05682 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -31,6 +31,7 @@ using OpenSim.Framework;
31using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
33using OpenSim.Region.Terrain; 33using OpenSim.Region.Terrain;
34using OpenSim.Region.Environment.Interfaces;
34 35
35namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Environment.Scenes
36{ 37{
@@ -58,6 +59,7 @@ namespace OpenSim.Region.Environment.Scenes
58 protected RegionInfo m_regInfo; 59 protected RegionInfo m_regInfo;
59 60
60 public TerrainEngine Terrain; 61 public TerrainEngine Terrain;
62 public ITerrainChannel Heightmap;
61 63
62 protected EventManager m_eventManager; 64 protected EventManager m_eventManager;
63 65