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

* minor: Adjust exception catching on load/save xml[2]/oar. 

* Allow non FileNotFoundExceptions to propogate rather than post a misleading error message
0.6.5-rc1
Justin Clarke Casey 2009-03-25 19:21:28 +00:00
parent 19595a2825
commit e694e1a657
1 changed files with 7 additions and 21 deletions
OpenSim/Region/Application

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

@ -1007,7 +1007,7 @@ namespace OpenSim
{ {
m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset); m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset);
} }
catch catch (FileNotFoundException)
{ {
m_console.Error("Default xml not found. Usage: load-xml <filename>"); m_console.Error("Default xml not found. Usage: load-xml <filename>");
} }
@ -1017,16 +1017,9 @@ namespace OpenSim
protected void SaveXml2(string module, string[] cmdparams) protected void SaveXml2(string module, string[] cmdparams)
{ {
if (cmdparams.Length > 2) if (cmdparams.Length > 2)
{
try
{ {
m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]); m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]);
} }
catch
{
m_console.Error("Unable to save xml. Usage: save xml2 <filename>");
}
}
else else
{ {
m_sceneManager.SaveCurrentSceneToXml2(DEFAULT_PRIM_BACKUP_FILENAME); m_sceneManager.SaveCurrentSceneToXml2(DEFAULT_PRIM_BACKUP_FILENAME);
@ -1041,7 +1034,7 @@ namespace OpenSim
{ {
m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]); m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]);
} }
catch catch (FileNotFoundException)
{ {
m_console.Error("Specified xml not found. Usage: load xml2 <filename>"); m_console.Error("Specified xml not found. Usage: load xml2 <filename>");
} }
@ -1052,7 +1045,7 @@ namespace OpenSim
{ {
m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME);
} }
catch catch (FileNotFoundException)
{ {
m_console.Error("Default xml not found. Usage: load xml2 <filename>"); m_console.Error("Default xml not found. Usage: load xml2 <filename>");
} }
@ -1071,7 +1064,7 @@ namespace OpenSim
{ {
m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
} }
catch catch (FileNotFoundException)
{ {
m_console.Error("Specified oar not found. Usage: load oar <filename>"); m_console.Error("Specified oar not found. Usage: load oar <filename>");
} }
@ -1082,7 +1075,7 @@ namespace OpenSim
{ {
m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
} }
catch catch (FileNotFoundException)
{ {
m_console.Error("Default oar not found. Usage: load oar <filename>"); m_console.Error("Default oar not found. Usage: load oar <filename>");
} }
@ -1096,16 +1089,9 @@ namespace OpenSim
protected void SaveOar(string module, string[] cmdparams) protected void SaveOar(string module, string[] cmdparams)
{ {
if (cmdparams.Length > 2) if (cmdparams.Length > 2)
{
try
{ {
m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]); m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]);
} }
catch
{
m_console.Error("Unable to save oar. Usage: save oar <filename>");
}
}
else else
{ {
m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME);