aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
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/Framework
parentMerge branch 'master' into varregion (diff)
downloadopensim-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 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITerrainModule.cs1
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 3fafc47..1c00b6c 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -29,6 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31 31
32using OpenMetaverse;
33
32namespace OpenSim.Region.Framework.Interfaces 34namespace OpenSim.Region.Framework.Interfaces
33{ 35{
34 /// <summary> 36 /// <summary>
@@ -109,7 +111,7 @@ namespace OpenSim.Region.Framework.Interfaces
109 /// assets are already known to be present in the grid's asset service. 111 /// assets are already known to be present in the grid's asset service.
110 /// </param> 112 /// </param>
111 /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> 113 /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
112 void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Guid requestId); 114 void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Vector3 displacement, Guid requestId);
113 115
114 /// <summary> 116 /// <summary>
115 /// Dearchive a region from a stream. This replaces the existing scene. 117 /// Dearchive a region from a stream. This replaces the existing scene.
@@ -136,6 +138,6 @@ namespace OpenSim.Region.Framework.Interfaces
136 /// assets are already known to be present in the grid's asset service. 138 /// assets are already known to be present in the grid's asset service.
137 /// </param 139 /// </param
138 /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> 140 /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
139 void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Guid requestId); 141 void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Vector3 displacement, Guid requestId);
140 } 142 }
141} 143}
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 5947afb..189a30a 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -51,6 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
51 /// </param> 51 /// </param>
52 /// <param name="stream"></param> 52 /// <param name="stream"></param>
53 void LoadFromStream(string filename, Stream stream); 53 void LoadFromStream(string filename, Stream stream);
54 void LoadFromStream(string filename, Vector2 displacement, Stream stream);
54 void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); 55 void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
55 /// <summary> 56 /// <summary>
56 /// Save a terrain to a stream. 57 /// Save a terrain to a stream.