aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMW2007-12-03 14:57:39 +0000
committerMW2007-12-03 14:57:39 +0000
commit690e517240495fdd80e12f605ab7f3a05a4be006 (patch)
tree47e93ec425d8d09d8d0f0ebfb8a1ed033cc3062e /OpenSim/Region/Application
parentFixed bug in Appearance update in AvatarFactoryModule. (diff)
downloadopensim-SC_OLD-690e517240495fdd80e12f605ab7f3a05a4be006.zip
opensim-SC_OLD-690e517240495fdd80e12f605ab7f3a05a4be006.tar.gz
opensim-SC_OLD-690e517240495fdd80e12f605ab7f3a05a4be006.tar.bz2
opensim-SC_OLD-690e517240495fdd80e12f605ab7f3a05a4be006.tar.xz
Added a flag to load-xml console command, that will generate new uuids for the loaded Sceneobjects (as per mantis request #53).
To use append "-newUID" to the end of the command, so new format is : "load-xml <filename> -newUID". If you don't add the "-newUID", then the uuids in the xml file will be kept.
Diffstat (limited to 'OpenSim/Region/Application')
-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