aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1f9894c..50018ac 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -659,11 +659,19 @@ namespace OpenSim
659 case "load-xml": 659 case "load-xml":
660 if (cmdparams.Length > 0) 660 if (cmdparams.Length > 0)
661 { 661 {
662 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0]); 662 bool generateNewIDS = false;
663 if (cmdparams.Length > 1)
664 {
665 if (cmdparams[1] == "-newUID")
666 {
667 generateNewIDS = true;
668 }
669 }
670 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS);
663 } 671 }
664 else 672 else
665 { 673 {
666 m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME); 674 m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false);
667 } 675 }
668 break; 676 break;
669 677