diff options
author | Sean Dague | 2007-12-05 18:45:05 +0000 |
---|---|---|
committer | Sean Dague | 2007-12-05 18:45:05 +0000 |
commit | 9c81b8a430b7fc8b0181310132f4bc9de414f19d (patch) | |
tree | ba6b03695d1bfdebfbc3c81bd55bc8ac41eeac46 /OpenSim/Region/Application | |
parent | * Applied MSSQL Patch from akokko, Thanks! akokko (diff) | |
download | opensim-SC_OLD-9c81b8a430b7fc8b0181310132f4bc9de414f19d.zip opensim-SC_OLD-9c81b8a430b7fc8b0181310132f4bc9de414f19d.tar.gz opensim-SC_OLD-9c81b8a430b7fc8b0181310132f4bc9de414f19d.tar.bz2 opensim-SC_OLD-9c81b8a430b7fc8b0181310132f4bc9de414f19d.tar.xz |
From Gary Chernega (IBM)
This patch adds x, y, and z offsets to the load-xml command.
If you had a prim at 100,100,20 thats where it would get loaded everytime.
This patch lets you place it at an offset from 100,100,20.. as such:
load-xml <filespec> -newUI 3 1 2
Loading the prim at 103, 101, 22
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index b941e2d..9ad6c5f 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -42,6 +42,7 @@ using OpenSim.Region.Environment; | |||
42 | using OpenSim.Region.Environment.Interfaces; | 42 | using OpenSim.Region.Environment.Interfaces; |
43 | using OpenSim.Region.Environment.Scenes; | 43 | using OpenSim.Region.Environment.Scenes; |
44 | using OpenSim.Region.Physics.Manager; | 44 | using OpenSim.Region.Physics.Manager; |
45 | using libsecondlife; | ||
45 | using Mono.Addins; | 46 | using Mono.Addins; |
46 | using Mono.Addins.Description; | 47 | using Mono.Addins.Description; |
47 | 48 | ||
@@ -664,6 +665,7 @@ namespace OpenSim | |||
664 | break; | 665 | break; |
665 | 666 | ||
666 | case "load-xml": | 667 | case "load-xml": |
668 | LLVector3 loadOffset = new LLVector3(0, 0, 0); | ||
667 | if (cmdparams.Length > 0) | 669 | if (cmdparams.Length > 0) |
668 | { | 670 | { |
669 | bool generateNewIDS = false; | 671 | bool generateNewIDS = false; |
@@ -672,13 +674,20 @@ namespace OpenSim | |||
672 | if (cmdparams[1] == "-newUID") | 674 | if (cmdparams[1] == "-newUID") |
673 | { | 675 | { |
674 | generateNewIDS = true; | 676 | generateNewIDS = true; |
675 | } | 677 | } |
678 | if (cmdparams.Length > 2) | ||
679 | { | ||
680 | loadOffset.X = (float)Convert.ToDecimal(cmdparams[2]); | ||
681 | if (cmdparams.Length > 3) { loadOffset.Y = (float)Convert.ToDecimal(cmdparams[3]); } | ||
682 | if (cmdparams.Length > 4) { loadOffset.Z = (float)Convert.ToDecimal(cmdparams[4]); } | ||
683 | m_log.Error("loadOffsets <X,Y,Z> = <" + loadOffset.X + "," + loadOffset.Y + "," + loadOffset.Z + ">"); | ||
684 | } | ||
676 | } | 685 | } |
677 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS); | 686 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
678 | } | 687 | } |
679 | else | 688 | else |
680 | { | 689 | { |
681 | m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false); | 690 | m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset); |
682 | } | 691 | } |
683 | break; | 692 | break; |
684 | 693 | ||