diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 6a09caf..0fb8a32 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -111,6 +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 | ||
115 | OptionSet options = new OptionSet(); | 116 | OptionSet options = new OptionSet(); |
116 | options.Add("m|merge", delegate (string v) { mergeOar = (v != null); }); | 117 | options.Add("m|merge", delegate (string v) { mergeOar = (v != null); }); |
@@ -122,6 +123,20 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
122 | options.Add("no-objects", delegate (string v) { noObjects = (v != null); }); | 123 | options.Add("no-objects", delegate (string v) { noObjects = (v != null); }); |
123 | options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; }); | 124 | options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; }); |
124 | options.Add("displacement=", delegate (string v) { | 125 | options.Add("displacement=", delegate (string v) { |
126 | ======= | ||
127 | |||
128 | OptionSet options = new OptionSet(); | ||
129 | options.Add("m|merge", delegate(string v) { mergeOar = (v != null); }); | ||
130 | options.Add("s|skip-assets", delegate(string v) { skipAssets = (v != null); }); | ||
131 | options.Add("force-terrain", delegate(string v) { forceTerrain = (v != null); }); | ||
132 | options.Add("forceterrain", delegate(string v) { forceTerrain = (v != null); }); // downward compatibility | ||
133 | options.Add("force-parcels", delegate(string v) { forceParcels = (v != null); }); | ||
134 | options.Add("forceparcels", delegate(string v) { forceParcels = (v != null); }); // downward compatibility | ||
135 | options.Add("no-objects", delegate(string v) { noObjects = (v != null); }); | ||
136 | options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; }); | ||
137 | options.Add("displacement=", delegate(string v) | ||
138 | { | ||
139 | >>>>>>> avn/ubitvar | ||
125 | try | 140 | try |
126 | { | 141 | { |
127 | displacement = v == null ? Vector3.Zero : Vector3.Parse(v); | 142 | displacement = v == null ? Vector3.Zero : Vector3.Parse(v); |
@@ -148,7 +163,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
148 | // Convert to radians for internals | 163 | // Convert to radians for internals |
149 | rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI; | 164 | rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI; |
150 | }); | 165 | }); |
166 | <<<<<<< HEAD | ||
151 | options.Add("rotation-center=", delegate (string v) { | 167 | options.Add("rotation-center=", delegate (string v) { |
168 | ======= | ||
169 | options.Add("rotation-center=", delegate(string v) | ||
170 | { | ||
171 | >>>>>>> avn/ubitvar | ||
152 | try | 172 | try |
153 | { | 173 | { |
154 | rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v); | 174 | rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v); |
@@ -288,12 +308,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
288 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); | 308 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); |
289 | DearchiveRegion(loadPath, Guid.Empty, archiveOptions); | 309 | DearchiveRegion(loadPath, Guid.Empty, archiveOptions); |
290 | } | 310 | } |
311 | <<<<<<< HEAD | ||
291 | 312 | ||
292 | public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options) | 313 | public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options) |
293 | { | 314 | { |
294 | m_log.InfoFormat( | 315 | m_log.InfoFormat( |
295 | "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath); | 316 | "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath); |
296 | 317 | ||
318 | ======= | ||
319 | |||
320 | public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string, object> options) | ||
321 | { | ||
322 | m_log.InfoFormat( | ||
323 | "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath); | ||
324 | |||
325 | >>>>>>> avn/ubitvar | ||
297 | new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion(); | 326 | new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion(); |
298 | } | 327 | } |
299 | 328 | ||
@@ -302,7 +331,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
302 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); | 331 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); |
303 | DearchiveRegion(loadStream, Guid.Empty, archiveOptions); | 332 | DearchiveRegion(loadStream, Guid.Empty, archiveOptions); |
304 | } | 333 | } |
334 | <<<<<<< HEAD | ||
305 | 335 | ||
336 | ======= | ||
337 | |||
338 | >>>>>>> avn/ubitvar | ||
306 | public void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options) | 339 | public void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options) |
307 | { | 340 | { |
308 | new ArchiveReadRequest(Scene, loadStream, requestId, options).DearchiveRegion(); | 341 | new ArchiveReadRequest(Scene, loadStream, requestId, options).DearchiveRegion(); |