aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Terrain.BasicTerrain
diff options
context:
space:
mode:
authorAdam Frisby2008-02-06 15:30:02 +0000
committerAdam Frisby2008-02-06 15:30:02 +0000
commitf93fdfa5af0a8dd39f471a97a55209451f7ca7a0 (patch)
tree210ba9757b0759232b4896febc482a9c5675e953 /OpenSim/Region/Terrain.BasicTerrain
parent* Added debug message to try track down Mantis#305. (diff)
downloadopensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.zip
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.gz
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.bz2
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.xz
* Marking off which uses of catch (Exception e) is legit and which are not, for later removal/replacement.
Diffstat (limited to 'OpenSim/Region/Terrain.BasicTerrain')
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index f722f12..248549e 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Terrain
681 } 681 }
682 return true; 682 return true;
683 } 683 }
684 catch (Exception e) 684 catch (Exception e) // SEMI-LEGIT: Catching problems caused by user input or scripts
685 { 685 {
686 resultText = "Error running terrain command: " + e.ToString(); 686 resultText = "Error running terrain command: " + e.ToString();
687 return false; 687 return false;
@@ -1343,7 +1343,7 @@ namespace OpenSim.Region.Terrain
1343 1343
1344 bmp.Save(filename, ImageFormat.Png); 1344 bmp.Save(filename, ImageFormat.Png);
1345 } 1345 }
1346 catch (Exception e) 1346 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
1347 { 1347 {
1348 Console.WriteLine("Failed generating terrain map: " + e.ToString()); 1348 Console.WriteLine("Failed generating terrain map: " + e.ToString());
1349 } 1349 }
@@ -1362,7 +1362,7 @@ namespace OpenSim.Region.Terrain
1362 1362
1363 imageData = OpenJPEG.EncodeFromImage(bmp, true); 1363 imageData = OpenJPEG.EncodeFromImage(bmp, true);
1364 } 1364 }
1365 catch (Exception e) 1365 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
1366 { 1366 {
1367 Console.WriteLine("Failed generating terrain map: " + e.ToString()); 1367 Console.WriteLine("Failed generating terrain map: " + e.ToString());
1368 } 1368 }