aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-18 18:44:55 +0000
committerJustin Clarke Casey2009-05-18 18:44:55 +0000
commit1cc9d1fd8dbe18ea74d9bcd5a7c3ff0c452499e7 (patch)
treeaf9377a55fecdfca60c05958126a916631d87067
parent* Resolve http://opensimulator.org/mantis/view.php?id=3191 (diff)
downloadopensim-SC_OLD-1cc9d1fd8dbe18ea74d9bcd5a7c3ff0c452499e7.zip
opensim-SC_OLD-1cc9d1fd8dbe18ea74d9bcd5a7c3ff0c452499e7.tar.gz
opensim-SC_OLD-1cc9d1fd8dbe18ea74d9bcd5a7c3ff0c452499e7.tar.bz2
opensim-SC_OLD-1cc9d1fd8dbe18ea74d9bcd5a7c3ff0c452499e7.tar.xz
* minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191
* didn't realize that we were getting back plain old exceptions
-rw-r--r--OpenSim/Region/Application/OpenSim.cs29
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
2 files changed, 10 insertions, 21 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 43a9d35..282963c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1107,32 +1107,21 @@ namespace OpenSim
1107 /// <param name="cmdparams"></param> 1107 /// <param name="cmdparams"></param>
1108 protected void LoadOar(string module, string[] cmdparams) 1108 protected void LoadOar(string module, string[] cmdparams)
1109 { 1109 {
1110 if (cmdparams.Length > 2) 1110 try
1111 { 1111 {
1112 try 1112 if (cmdparams.Length > 2)
1113 { 1113 {
1114 m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); 1114 m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
1115 } 1115 }
1116 catch (FileNotFoundException) 1116 else
1117 { 1117 {
1118 m_console.Error("Specified oar file not found."); 1118 m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
1119 }
1120 catch (DirectoryNotFoundException)
1121 {
1122 m_console.Error("Specified directory not found.");
1123 } 1119 }
1124 } 1120 }
1125 else 1121 catch (Exception e)
1126 { 1122 {
1127 try 1123 m_console.Error(e.Message);
1128 { 1124 }
1129 m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
1130 }
1131 catch (FileNotFoundException)
1132 {
1133 m_console.Error("Default oar file not found.");
1134 }
1135 }
1136 } 1125 }
1137 1126
1138 /// <summary> 1127 /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index e3d2aee..a3ec419 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
449 } 449 }
450 catch (Exception e) 450 catch (Exception e)
451 { 451 {
452 throw new Exception(String.Format("Unable to create file input stream for {0}: {1}", path, e)); 452 throw new Exception(String.Format("Unable to create file input stream for {0}: {1}", path, e.Message));
453 } 453 }
454 } 454 }
455 455