ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2016-11-27 15:14:34 +00:00
parent 08dee3fa34 d3cd323f0c
commit 877d3092b4
47 changed files with 645 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,22 +242,22 @@ namespace OpenSim
ChangeSelectedRegion);
m_console.Commands.AddCommand("Archiving", false, "save xml",
"save xml",
"save xml [<file name>]",
"Save a region's data in XML format",
SaveXml);
m_console.Commands.AddCommand("Archiving", false, "save xml2",
"save xml2",
"save xml2 [<file name>]",
"Save a region's data in XML2 format",
SaveXml2);
m_console.Commands.AddCommand("Archiving", false, "load xml",
"load xml [-newIDs [<x> <y> <z>]]",
"load xml [<file name> [-newUID [<x> <y> <z>]]]",
"Load a region's data from XML format",
LoadXml);
m_console.Commands.AddCommand("Archiving", false, "load xml2",
"load xml2",
"load xml2 [<file name>]",
"Load a region's data from XML2 format",
LoadXml2);
@@ -1068,7 +1068,7 @@ namespace OpenSim
/// <param name="cmdparams"></param>
protected void SavePrimsXml2(string module, string[] cmdparams)
{
if (cmdparams.Length > 5)
if (cmdparams.Length > 4)
{
SceneManager.SaveNamedPrimsToXml2(cmdparams[3], cmdparams[4]);
}
@@ -1087,7 +1087,7 @@ namespace OpenSim
{
MainConsole.Instance.Output("PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason.");
if (cmdparams.Length > 0)
if (cmdparams.Length > 2)
{
SceneManager.SaveCurrentSceneToXml(cmdparams[2]);
}