diff options
author | Robert Adams | 2014-01-19 11:03:08 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-19 11:03:08 -0800 |
commit | 6fbfb47b92cf01b839208d0cc7898749306e19f4 (patch) | |
tree | b833914d24f624662550e637b0ecabaf92d3e387 /OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |
parent | varregion: add --displacement parameter to 'load oar'. (diff) | |
download | opensim-SC_OLD-6fbfb47b92cf01b839208d0cc7898749306e19f4.zip opensim-SC_OLD-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.gz opensim-SC_OLD-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.bz2 opensim-SC_OLD-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 'OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 1c00b6c..99bc87d 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |||
@@ -102,16 +102,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
102 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | 102 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. |
103 | /// | 103 | /// |
104 | /// <param name="loadPath"></param> | 104 | /// <param name="loadPath"></param> |
105 | /// <param name="merge"> | ||
106 | /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region | ||
107 | /// settings in the archive will be ignored. | ||
108 | /// </param> | ||
109 | /// <param name="skipAssets"> | ||
110 | /// If true, the archive is loaded without loading any assets contained within it. This is useful if the | ||
111 | /// assets are already known to be present in the grid's asset service. | ||
112 | /// </param> | ||
113 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 105 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
114 | void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Vector3 displacement, Guid requestId); | 106 | /// <param name="options"> |
107 | /// Dictionary of options. | ||
108 | /// </param> | ||
109 | void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options); | ||
115 | 110 | ||
116 | /// <summary> | 111 | /// <summary> |
117 | /// Dearchive a region from a stream. This replaces the existing scene. | 112 | /// Dearchive a region from a stream. This replaces the existing scene. |
@@ -129,15 +124,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
129 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | 124 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. |
130 | /// | 125 | /// |
131 | /// <param name="loadStream"></param> | 126 | /// <param name="loadStream"></param> |
132 | /// <param name="merge"> | ||
133 | /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region | ||
134 | /// settings in the archive will be ignored. | ||
135 | /// </param> | ||
136 | /// <param name="skipAssets"> | ||
137 | /// If true, the archive is loaded without loading any assets contained within it. This is useful if the | ||
138 | /// assets are already known to be present in the grid's asset service. | ||
139 | /// </param | ||
140 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 127 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
141 | void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Vector3 displacement, Guid requestId); | 128 | /// <param name="options"> |
129 | /// Dictionary of options. | ||
130 | /// </param> | ||
131 | void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string,object> options); | ||
142 | } | 132 | } |
143 | } | 133 | } |