* minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191
* didn't realize that we were getting back plain old exceptions0.6.6-post-fixes
parent
29671fc103
commit
1cc9d1fd8d
|
@ -1107,32 +1107,21 @@ namespace OpenSim
|
|||
/// <param name="cmdparams"></param>
|
||||
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.");
|
||||
}
|
||||
catch (DirectoryNotFoundException)
|
||||
{
|
||||
m_console.Error("Specified directory not found.");
|
||||
m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
|
||||
}
|
||||
}
|
||||
else
|
||||
catch (Exception e)
|
||||
{
|
||||
try
|
||||
{
|
||||
m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
m_console.Error("Default oar file not found.");
|
||||
}
|
||||
}
|
||||
m_console.Error(e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
|||
}
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue