ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

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

@@ -1007,7 +1007,14 @@ namespace OpenSim
{
if (cmdparams.Length > 2)
{
m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]);
try
{
m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]);
}
catch
{
m_console.Error("Unable to save xml. Usage: save xml2 <filename>");
}
}
else
{
@@ -1019,7 +1026,14 @@ namespace OpenSim
{
if (cmdparams.Length > 2)
{
m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]);
try
{
m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]);
}
catch
{
m_console.Error("Specified xml not found. Usage: load xml2 <filename>");
}
}
else
{
@@ -1042,7 +1056,14 @@ namespace OpenSim
{
if (cmdparams.Length > 2)
{
m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
try
{
m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
}
catch
{
m_console.Error("Specified oar not found. Usage: load oar <filename>");
}
}
else
{
@@ -1052,7 +1073,7 @@ namespace OpenSim
}
catch
{
m_console.Error("Default oar not found. Usage: load-oar <filename>");
m_console.Error("Default oar not found. Usage: load oar <filename>");
}
}
}
@@ -1065,7 +1086,14 @@ namespace OpenSim
{
if (cmdparams.Length > 2)
{
m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]);
try
{
m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]);
}
catch
{
m_console.Error("Unable to save oar. Usage: save oar <filename>");
}
}
else
{