diff options
author | Robert Adams | 2014-01-19 10:09:43 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-19 10:09:43 -0800 |
commit | dd6db7293975bffc3693e0164dda8307a4e4bcf7 (patch) | |
tree | cfd275e8cbc9e64913b1dbf033164956b37098c5 /OpenSim/ApplicationPlugins | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-dd6db7293975bffc3693e0164dda8307a4e4bcf7.zip opensim-SC_OLD-dd6db7293975bffc3693e0164dda8307a4e4bcf7.tar.gz opensim-SC_OLD-dd6db7293975bffc3693e0164dda8307a4e4bcf7.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 3cdf8d3..3cd6b3b 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1484,8 +1484,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1484 | } | 1484 | } |
1485 | 1485 | ||
1486 | IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); | 1486 | IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); |
1487 | Vector3 displacement = new Vector3(0f, 0f, 0f); | ||
1487 | if (archiver != null) | 1488 | if (archiver != null) |
1488 | archiver.DearchiveRegion(filename, mergeOar, skipAssets, Guid.Empty); | 1489 | archiver.DearchiveRegion(filename, mergeOar, skipAssets, displacement, Guid.Empty); |
1489 | else | 1490 | else |
1490 | throw new Exception("Archiver module not present for scene"); | 1491 | throw new Exception("Archiver module not present for scene"); |
1491 | 1492 | ||