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.

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
                 case "load-xml":
                     if (cmdparams.Length > 0)
                     {
-                        m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0]);
+                        bool generateNewIDS = false;
+                        if (cmdparams.Length > 1)
+                        {
+                            if (cmdparams[1] == "-newUID")
+                            {
+                                generateNewIDS = true;
+                            } 
+                        }
+                        m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS);
                     }
                     else
                     {
-                        m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME);
+                        m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false);
                     }
                     break;