aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorRobert Adams2014-01-19 10:09:43 -0800
committerRobert Adams2014-01-19 10:09:43 -0800
commitdd6db7293975bffc3693e0164dda8307a4e4bcf7 (patch)
treecfd275e8cbc9e64913b1dbf033164956b37098c5 /OpenSim/Region/Application
parentMerge branch 'master' into varregion (diff)
downloadopensim-SC-dd6db7293975bffc3693e0164dda8307a4e4bcf7.zip
opensim-SC-dd6db7293975bffc3693e0164dda8307a4e4bcf7.tar.gz
opensim-SC-dd6db7293975bffc3693e0164dda8307a4e4bcf7.tar.bz2
opensim-SC-dd6db7293975bffc3693e0164dda8307a4e4bcf7.tar.xz
varregion: add --displacement parameter to 'load oar'.
Adds displacment to all objects and terrain loaded from the oar. As an example, if you have a 512x512 region and an old 256x256 oar, doing load oar --displacement "<128,128,0>" oarFile.oar will load the object (and terrain) into the middle of the 512x512 region. If displacement is not specified, 'load oar' works like it always has. If you have a 5
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 0a6ae98..a336178 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -266,10 +266,11 @@ namespace OpenSim
266 SavePrimsXml2); 266 SavePrimsXml2);
267 267
268 m_console.Commands.AddCommand("Archiving", false, "load oar", 268 m_console.Commands.AddCommand("Archiving", false, "load oar",
269 "load oar [--merge] [--skip-assets] [<OAR path>]", 269 "load oar [--merge] [--skip-assets] [--displacement \"<x,y,z>\"] [<OAR path>]",
270 "Load a region's data from an OAR archive.", 270 "Load a region's data from an OAR archive.",
271 "--merge will merge the OAR with the existing scene." + Environment.NewLine 271 "--merge will merge the OAR with the existing scene." + Environment.NewLine
272 + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine 272 + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine
273 + "--displacement will add this value to the position of every object loaded" + Environment.NewLine
273 + "The path can be either a filesystem location or a URI." 274 + "The path can be either a filesystem location or a URI."
274 + " If this is not given then the command looks for an OAR named region.oar in the current directory.", 275 + " If this is not given then the command looks for an OAR named region.oar in the current directory.",
275 LoadOar); 276 LoadOar);