OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Removed some catch-all-ignores from UDPServer in an attempt to look for #305. 

* Minor work towards abstracting terrain.
ThreadPoolClientBranch
Adam Frisby 2008-02-14 16:13:53 +00:00
parent 3a208a3a4f
commit 91d9248fce
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -189,9 +189,9 @@ namespace OpenSim.Region.ClientStack
return; return;
} }
catch (ObjectDisposedException) catch (ObjectDisposedException e)
{ {
//m_log.Debug("[UDPSERVER]: " + e.ToString()); m_log.Debug("[UDPSERVER]: " + e.ToString());
return; return;
} }
@ -201,9 +201,9 @@ namespace OpenSim.Region.ClientStack
{ {
packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
} }
catch (Exception) catch (Exception e)
{ {
m_log.Debug("[UDPSERVER]: " + e.ToString());
} }
if (packet != null) if (packet != null)

3
OpenSim/Region/Environment/Modules/TerrainModule.cs → OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
View File

@ -32,11 +32,12 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Modules;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using libsecondlife; using libsecondlife;
namespace OpenSim.Region.Environment.Modules namespace OpenSim.Region.Environment.Modules.Terrain
{ {
/// <summary> /// <summary>
/// A new version of the old Channel class, simplified /// A new version of the old Channel class, simplified

2
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@ -31,6 +31,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Region.Terrain; using OpenSim.Region.Terrain;
using OpenSim.Region.Environment.Interfaces;
namespace OpenSim.Region.Environment.Scenes namespace OpenSim.Region.Environment.Scenes
{ {
@ -58,6 +59,7 @@ namespace OpenSim.Region.Environment.Scenes
protected RegionInfo m_regInfo; protected RegionInfo m_regInfo;
public TerrainEngine Terrain; public TerrainEngine Terrain;
public ITerrainChannel Heightmap;
protected EventManager m_eventManager; protected EventManager m_eventManager;