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

* minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191 

* didn't realize that we were getting back plain old exceptions
0.6.6-post-fixes
Justin Clarke Casey 2009-05-18 18:44:55 +00:00
parent 29671fc103
commit 1cc9d1fd8d
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/Application/OpenSim.cs
View File

@ -1107,32 +1107,21 @@ namespace OpenSim
/// <param name="cmdparams"></param> /// <param name="cmdparams"></param>
protected void LoadOar(string module, string[] cmdparams) protected void LoadOar(string module, string[] cmdparams)
{ {
if (cmdparams.Length > 2) try
{ {
try if (cmdparams.Length > 2)
{ {
m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
} }
catch (FileNotFoundException) else
{ {
m_console.Error("Specified oar file not found."); m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
}
catch (DirectoryNotFoundException)
{
m_console.Error("Specified directory not found.");
} }
} }
else catch (Exception e)
{ {
try m_console.Error(e.Message);
{ }
m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
}
catch (FileNotFoundException)
{
m_console.Error("Default oar file not found.");
}
}
} }
/// <summary> /// <summary>

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
} }
catch (Exception e) catch (Exception e)
{ {
throw new Exception(String.Format("Unable to create file input stream for {0}: {1}", path, e)); throw new Exception(String.Format("Unable to create file input stream for {0}: {1}", path, e.Message));
} }
} }