diff options
author | Jak Daniels | 2015-11-19 13:28:17 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-22 01:32:48 +0000 |
commit | 0b216c37df7a88c12d7abb10e27ddbdaffcc6320 (patch) | |
tree | ffbf5f276ab73f0ade720e7c05963524634021d3 /OpenSim/Region/Application/OpenSim.cs | |
parent | Changes to TerrainModule/ITerrainModule to support importing OARs with differ... (diff) | |
download | opensim-SC_OLD-0b216c37df7a88c12d7abb10e27ddbdaffcc6320.zip opensim-SC_OLD-0b216c37df7a88c12d7abb10e27ddbdaffcc6320.tar.gz opensim-SC_OLD-0b216c37df7a88c12d7abb10e27ddbdaffcc6320.tar.bz2 opensim-SC_OLD-0b216c37df7a88c12d7abb10e27ddbdaffcc6320.tar.xz |
Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index a2ba8c0..4ab48e3 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -267,26 +267,36 @@ namespace OpenSim | |||
267 | SavePrimsXml2); | 267 | SavePrimsXml2); |
268 | 268 | ||
269 | m_console.Commands.AddCommand("Archiving", false, "load oar", | 269 | m_console.Commands.AddCommand("Archiving", false, "load oar", |
270 | "load oar [--merge] [--skip-assets]" | 270 | "load oar [-m|--merge] [-s|--skip-assets]" |
271 | + " [--default-user \"User Name\"]" | 271 | + " [--default-user \"User Name\"]" |
272 | + " [--force-terrain] [--force-parcels]" | 272 | + " [--force-terrain] [--force-parcels]" |
273 | + " [--no-objects]" | 273 | + " [--no-objects]" |
274 | + " [--rotation degrees] [--rotation-center \"<x,y,z>\"]" | 274 | + " [--rotation degrees]" |
275 | + " [--bounding-origin \"<x,y,z>\"]" | ||
276 | + " [--bounding-size \"<x,y,z>\"]" | ||
275 | + " [--displacement \"<x,y,z>\"]" | 277 | + " [--displacement \"<x,y,z>\"]" |
278 | + " [-d|--debug]" | ||
276 | + " [<OAR path>]", | 279 | + " [<OAR path>]", |
277 | "Load a region's data from an OAR archive.", | 280 | "Load a region's data from an OAR archive.", |
278 | "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading).\n" | 281 | "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading).\n" |
282 | + "--skip-assets will load the OAR but ignore the assets it contains.\n" | ||
279 | + "--default-user will use this user for any objects with an owner whose UUID is not found in the grid.\n" | 283 | + "--default-user will use this user for any objects with an owner whose UUID is not found in the grid.\n" |
280 | + "--displacement will add this value to the position of every object loaded.\n" | ||
281 | + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge).\n" | 284 | + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge).\n" |
282 | + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge).\n" | 285 | + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge).\n" |
283 | + "--no-objects suppresses the addition of any objects (good for loading only the terrain).\n" | 286 | + "--no-objects suppresses the addition of any objects (good for loading only the terrain).\n" |
284 | + "--rotation specified rotation to be applied to the oar. Specified in degrees.\n" | 287 | + "--rotation specified rotation to be applied to the oar. Specified in degrees.\n" |
285 | + "--rotation-center Location (relative to original OAR) to apply rotation. Default is <128,128,0>.\n" | 288 | + "--bounding-origin will only place objects that after displacement and rotation fall within the bounding cube who's position starts at <x,y,z>. Defaults to <0,0,0>.\n" |
286 | + "--skip-assets will load the OAR but ignore the assets it contains.\n\n" | 289 | + "--bounding-size specifies the size of the bounding cube. The default is the size of the destination region and cannot be larger than this.\n" |
290 | + "--displacement will add this value to the position of every object loaded.\n" | ||
291 | + "--debug forces the archiver to display messages about where each object is being placed.\n\n" | ||
287 | + "The path can be either a filesystem location or a URI.\n" | 292 | + "The path can be either a filesystem location or a URI.\n" |
288 | + " If this is not given then the command looks for an OAR named region.oar in the current directory.", | 293 | + " If this is not given then the command looks for an OAR named region.oar in the current directory." |
289 | LoadOar); | 294 | + " [--rotation-center \"<x,y,z>\"] used to be an option, now it does nothing and will be removed soon." |
295 | + "When an OAR is being loaded, operations are applied in this order:\n" | ||
296 | + "1: Rotation (around the incoming OARs region center)\n" | ||
297 | + "2: Cropping (a bounding cube with origin and size)\n" | ||
298 | + "3: Displacement (setting offset coordinates within the destination region)", | ||
299 | LoadOar); ; | ||
290 | 300 | ||
291 | m_console.Commands.AddCommand("Archiving", false, "save oar", | 301 | m_console.Commands.AddCommand("Archiving", false, "save oar", |
292 | //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", | 302 | //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", |
@@ -312,7 +322,7 @@ namespace OpenSim | |||
312 | 322 | ||
313 | m_console.Commands.AddCommand("Objects", false, "rotate scene", | 323 | m_console.Commands.AddCommand("Objects", false, "rotate scene", |
314 | "rotate scene <degrees> [centerX, centerY]", | 324 | "rotate scene <degrees> [centerX, centerY]", |
315 | "Rotates all scene objects around centerX, centerY (defailt 128, 128) (please back up your region before using)", | 325 | "Rotates all scene objects around centerX, centerY (default 128, 128) (please back up your region before using)", |
316 | HandleRotateScene); | 326 | HandleRotateScene); |
317 | 327 | ||
318 | m_console.Commands.AddCommand("Objects", false, "scale scene", | 328 | m_console.Commands.AddCommand("Objects", false, "scale scene", |