diff options
author | lbsa71 | 2007-06-12 18:47:36 +0000 |
---|---|---|
committer | lbsa71 | 2007-06-12 18:47:36 +0000 |
commit | 4d1d5eb0c6fb34f8bfa38bda4123eb425757ace4 (patch) | |
tree | da37fa07f7a31a38b98a03342ac7e17aa58fcf44 /OpenSim/OpenSim.RegionServer/Simulator | |
parent | *Reverting back to 977 -- will look into this later (diff) | |
download | opensim-SC-4d1d5eb0c6fb34f8bfa38bda4123eb425757ace4.zip opensim-SC-4d1d5eb0c6fb34f8bfa38bda4123eb425757ace4.tar.gz opensim-SC-4d1d5eb0c6fb34f8bfa38bda4123eb425757ace4.tar.bz2 opensim-SC-4d1d5eb0c6fb34f8bfa38bda4123eb425757ace4.tar.xz |
* ignored data recieved from closed sockets
* removed some warnings
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/Simulator')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Simulator/World.cs | 2 |
2 files changed, 3 insertions, 3 deletions
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 | |||
237 | } | 237 | } |
238 | } | 238 | } |
239 | } | 239 | } |
240 | catch (Exception e) | 240 | catch |
241 | { | 241 | { |
242 | return false; //Exception. For now, lets skip subdivision | 242 | return false; //Exception. For now, lets skip subdivision |
243 | } | 243 | } |
@@ -294,7 +294,7 @@ namespace OpenSim.RegionServer.Simulator | |||
294 | startParcel = getParcel(start_x, start_y); | 294 | startParcel = getParcel(start_x, start_y); |
295 | endParcel = getParcel(end_x, end_y); | 295 | endParcel = getParcel(end_x, end_y); |
296 | } | 296 | } |
297 | catch (Exception e) | 297 | catch |
298 | { | 298 | { |
299 | return false; //Error occured when trying to get the start and end parcels | 299 | return false; //Error occured when trying to get the start and end parcels |
300 | } | 300 | } |
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 | |||
478 | this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile); | 478 | this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile); |
479 | this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier; | 479 | this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier; |
480 | } | 480 | } |
481 | catch (Exception e) | 481 | catch |
482 | { | 482 | { |
483 | Console.WriteLine("Unable to load default terrain, procedurally generating instead..."); | 483 | Console.WriteLine("Unable to load default terrain, procedurally generating instead..."); |
484 | Terrain.hills(); | 484 | Terrain.hills(); |