aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorRobert Adams2014-01-19 11:03:08 -0800
committerRobert Adams2014-01-19 11:03:08 -0800
commit6fbfb47b92cf01b839208d0cc7898749306e19f4 (patch)
treeb833914d24f624662550e637b0ecabaf92d3e387 /OpenSim/Region/Application/OpenSim.cs
parentvarregion: add --displacement parameter to 'load oar'. (diff)
downloadopensim-SC-6fbfb47b92cf01b839208d0cc7898749306e19f4.zip
opensim-SC-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.gz
opensim-SC-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.bz2
opensim-SC-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.xz
varregion: add --noterrain and --noparcel to 'load oar'.
--noterrain suppresses the loading of the terrain from the oar. --noparcels suppresses the loading of parcel information from the oar.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a336178..30e2b1b 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -266,11 +266,13 @@ 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] [--displacement \"<x,y,z>\"] [<OAR path>]", 269 "load oar [--merge] [--skip-assets] [--noterrain] [--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 + "--displacement will add this value to the position of every object loaded" + Environment.NewLine
274 + "--noterrain suppresses the loading of terrain from the oar" + Environment.NewLine
275 + "--noparcels suppresses the loading of parcels from the oar" + Environment.NewLine
274 + "The path can be either a filesystem location or a URI." 276 + "The path can be either a filesystem location or a URI."
275 + " If this is not given then the command looks for an OAR named region.oar in the current directory.", 277 + " If this is not given then the command looks for an OAR named region.oar in the current directory.",
276 LoadOar); 278 LoadOar);