From 4d1d5eb0c6fb34f8bfa38bda4123eb425757ace4 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 12 Jun 2007 18:47:36 +0000 Subject: * ignored data recieved from closed sockets * removed some warnings --- OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs | 4 ++-- OpenSim/OpenSim.RegionServer/Simulator/World.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/OpenSim.RegionServer/Simulator') diff --git a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs index 8620e8c..ace0d20 100644 --- a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs +++ b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs @@ -237,7 +237,7 @@ namespace OpenSim.RegionServer.Simulator } } } - catch (Exception e) + catch { return false; //Exception. For now, lets skip subdivision } @@ -294,7 +294,7 @@ namespace OpenSim.RegionServer.Simulator startParcel = getParcel(start_x, start_y); endParcel = getParcel(end_x, end_y); } - catch (Exception e) + catch { return false; //Error occured when trying to get the start and end parcels } diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.cs index 765c74e..ac64c79 100644 --- a/OpenSim/OpenSim.RegionServer/Simulator/World.cs +++ b/OpenSim/OpenSim.RegionServer/Simulator/World.cs @@ -478,7 +478,7 @@ namespace OpenSim.RegionServer.Simulator this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile); this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier; } - catch (Exception e) + catch { Console.WriteLine("Unable to load default terrain, procedurally generating instead..."); Terrain.hills(); -- cgit v1.1