diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 0fb8a32..4178a57 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -111,19 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
111 | String defaultUser = ""; | 111 | String defaultUser = ""; |
112 | float rotation = 0f; | 112 | float rotation = 0f; |
113 | Vector3 rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0); | 113 | Vector3 rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0); |
114 | <<<<<<< HEAD | 114 | |
115 | |||
116 | OptionSet options = new OptionSet(); | ||
117 | options.Add("m|merge", delegate (string v) { mergeOar = (v != null); }); | ||
118 | options.Add("s|skip-assets", delegate (string v) { skipAssets = (v != null); }); | ||
119 | options.Add("force-terrain", delegate (string v) { forceTerrain = (v != null); }); | ||
120 | options.Add("forceterrain", delegate (string v) { forceTerrain = (v != null); }); // downward compatibility | ||
121 | options.Add("force-parcels", delegate (string v) { forceParcels = (v != null); }); | ||
122 | options.Add("forceparcels", delegate (string v) { forceParcels = (v != null); }); // downward compatibility | ||
123 | options.Add("no-objects", delegate (string v) { noObjects = (v != null); }); | ||
124 | options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; }); | ||
125 | options.Add("displacement=", delegate (string v) { | ||
126 | ======= | ||
127 | 115 | ||
128 | OptionSet options = new OptionSet(); | 116 | OptionSet options = new OptionSet(); |
129 | options.Add("m|merge", delegate(string v) { mergeOar = (v != null); }); | 117 | options.Add("m|merge", delegate(string v) { mergeOar = (v != null); }); |
@@ -136,7 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
136 | options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; }); | 124 | options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; }); |
137 | options.Add("displacement=", delegate(string v) | 125 | options.Add("displacement=", delegate(string v) |
138 | { | 126 | { |
139 | >>>>>>> avn/ubitvar | ||
140 | try | 127 | try |
141 | { | 128 | { |
142 | displacement = v == null ? Vector3.Zero : Vector3.Parse(v); | 129 | displacement = v == null ? Vector3.Zero : Vector3.Parse(v); |
@@ -163,12 +150,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
163 | // Convert to radians for internals | 150 | // Convert to radians for internals |
164 | rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI; | 151 | rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI; |
165 | }); | 152 | }); |
166 | <<<<<<< HEAD | ||
167 | options.Add("rotation-center=", delegate (string v) { | ||
168 | ======= | ||
169 | options.Add("rotation-center=", delegate(string v) | 153 | options.Add("rotation-center=", delegate(string v) |
170 | { | 154 | { |
171 | >>>>>>> avn/ubitvar | ||
172 | try | 155 | try |
173 | { | 156 | { |
174 | rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v); | 157 | rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v); |
@@ -308,21 +291,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
308 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); | 291 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); |
309 | DearchiveRegion(loadPath, Guid.Empty, archiveOptions); | 292 | DearchiveRegion(loadPath, Guid.Empty, archiveOptions); |
310 | } | 293 | } |
311 | <<<<<<< HEAD | ||
312 | |||
313 | public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options) | ||
314 | { | ||
315 | m_log.InfoFormat( | ||
316 | "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath); | ||
317 | |||
318 | ======= | ||
319 | 294 | ||
320 | public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string, object> options) | 295 | public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string, object> options) |
321 | { | 296 | { |
322 | m_log.InfoFormat( | 297 | m_log.InfoFormat( |
323 | "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath); | 298 | "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath); |
324 | 299 | ||
325 | >>>>>>> avn/ubitvar | ||
326 | new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion(); | 300 | new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion(); |
327 | } | 301 | } |
328 | 302 | ||
@@ -331,11 +305,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
331 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); | 305 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); |
332 | DearchiveRegion(loadStream, Guid.Empty, archiveOptions); | 306 | DearchiveRegion(loadStream, Guid.Empty, archiveOptions); |
333 | } | 307 | } |
334 | <<<<<<< HEAD | ||
335 | |||
336 | ======= | ||
337 | |||
338 | >>>>>>> avn/ubitvar | ||
339 | public void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options) | 308 | public void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options) |
340 | { | 309 | { |
341 | new ArchiveReadRequest(Scene, loadStream, requestId, options).DearchiveRegion(); | 310 | new ArchiveReadRequest(Scene, loadStream, requestId, options).DearchiveRegion(); |