diff options
Made some changes to the load/save xml format, So that the old format can still be used, I have added new console commands of "load-xml2" and "save-xml2", if the old versions worked for you then please continue using them (at least for now). The new versions haven't been tested that much, so their format could be subject to change.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index c367537..d2f5648 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -146,7 +146,6 @@ namespace OpenSim | |||
146 | m_networkServersInfo.loadFromConfiguration(m_config); | 146 | m_networkServersInfo.loadFromConfiguration(m_config); |
147 | } | 147 | } |
148 | 148 | ||
149 | |||
150 | /// <summary> | 149 | /// <summary> |
151 | /// Performs initialisation of the scene, such as loading configuration from disk. | 150 | /// Performs initialisation of the scene, such as loading configuration from disk. |
152 | /// </summary> | 151 | /// </summary> |
@@ -485,6 +484,28 @@ namespace OpenSim | |||
485 | } | 484 | } |
486 | break; | 485 | break; |
487 | 486 | ||
487 | case "save-xml2": | ||
488 | if (cmdparams.Length > 0) | ||
489 | { | ||
490 | m_sceneManager.SaveCurrentSceneToXml2(cmdparams[0]); | ||
491 | } | ||
492 | else | ||
493 | { | ||
494 | m_sceneManager.SaveCurrentSceneToXml2(DEFAULT_PRIM_BACKUP_FILENAME); | ||
495 | } | ||
496 | break; | ||
497 | |||
498 | case "load-xml2": | ||
499 | if (cmdparams.Length > 0) | ||
500 | { | ||
501 | m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[0]); | ||
502 | } | ||
503 | else | ||
504 | { | ||
505 | m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); | ||
506 | } | ||
507 | break; | ||
508 | |||
488 | case "terrain": | 509 | case "terrain": |
489 | if (!m_sceneManager.RunTerrainCmdOnCurrentScene(cmdparams, ref result)) | 510 | if (!m_sceneManager.RunTerrainCmdOnCurrentScene(cmdparams, ref result)) |
490 | { | 511 | { |