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

* Apply http://opensimulator.org/mantis/view.php?id=3191 

* Make load/save oar and load/save xml2 behave a little better when there is an io problem
* Thanks dslake
GenericGridServerConcept
Justin Clarke Casey 2009-02-26 21:00:33 +00:00
parent 5254c1dfa7
commit 7b04d1da5e
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1006,9 +1006,16 @@ 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);
@ -1018,9 +1025,16 @@ namespace OpenSim
protected void LoadXml2(string module, string[] cmdparams) protected void LoadXml2(string module, string[] cmdparams)
{ {
if (cmdparams.Length > 2) if (cmdparams.Length > 2)
{
try
{ {
m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]); m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]);
} }
catch
{
m_console.Error("Specified xml not found. Usage: load xml2 <filename>");
}
}
else else
{ {
try try
@ -1041,9 +1055,16 @@ namespace OpenSim
protected void LoadOar(string module, string[] cmdparams) protected void LoadOar(string module, string[] cmdparams)
{ {
if (cmdparams.Length > 2) if (cmdparams.Length > 2)
{
try
{ {
m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
} }
catch
{
m_console.Error("Specified oar not found. Usage: load oar <filename>");
}
}
else else
{ {
try try
@ -1052,7 +1073,7 @@ namespace OpenSim
} }
catch catch
{ {
m_console.Error("Default oar not found. Usage: load-oar <filename>"); m_console.Error("Default oar not found. Usage: load oar <filename>");
} }
} }
} }
@ -1064,9 +1085,16 @@ 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);