diff options
author | Robert Adams | 2014-02-02 12:21:18 -0800 |
---|---|---|
committer | Robert Adams | 2014-02-02 12:21:18 -0800 |
commit | 2a4dd34616bdb0641f841766dfd15c4c784d3549 (patch) | |
tree | 4c01fa16ca4b96218ff4ba5d7026f659a6056334 /OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |
parent | Implement terrain merging in TerrainChannel. (diff) | |
download | opensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.zip opensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.gz opensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.bz2 opensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.xz |
Change new 'load oar' parameters to be hyphenated to be consistant with
existing parameters. ('--forceterrain' becomes '--force-terrain').
The old forms have been kept for downward compatiblity.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 6fbac4c..9fa1fbd 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -113,8 +113,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
113 | OptionSet options = new OptionSet(); | 113 | OptionSet options = new OptionSet(); |
114 | options.Add("m|merge", delegate (string v) { mergeOar = (v != null); }); | 114 | options.Add("m|merge", delegate (string v) { mergeOar = (v != null); }); |
115 | options.Add("s|skip-assets", delegate (string v) { skipAssets = (v != null); }); | 115 | options.Add("s|skip-assets", delegate (string v) { skipAssets = (v != null); }); |
116 | options.Add("forceterrain", delegate (string v) { forceTerrain = (v != null); }); | 116 | options.Add("force-terrain", delegate (string v) { forceTerrain = (v != null); }); |
117 | options.Add("forceparcels", delegate (string v) { forceParcels = (v != null); }); | 117 | options.Add("force-parcels", delegate (string v) { forceParcels = (v != null); }); |
118 | options.Add("displacement=", delegate (string v) { | 118 | options.Add("displacement=", delegate (string v) { |
119 | try | 119 | try |
120 | { | 120 | { |
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
141 | // Convert to radians for internals | 141 | // Convert to radians for internals |
142 | rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI; | 142 | rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI; |
143 | }); | 143 | }); |
144 | options.Add("rotationcenter=", delegate (string v) { | 144 | options.Add("rotation-center=", delegate (string v) { |
145 | try | 145 | try |
146 | { | 146 | { |
147 | rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v); | 147 | rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v); |
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
149 | catch | 149 | catch |
150 | { | 150 | { |
151 | m_log.ErrorFormat("[ARCHIVER MODULE] failure parsing rotation displacement"); | 151 | m_log.ErrorFormat("[ARCHIVER MODULE] failure parsing rotation displacement"); |
152 | m_log.ErrorFormat("[ARCHIVER MODULE] Must be represented as vector3: --rotationcenter \"<128,128,0>\""); | 152 | m_log.ErrorFormat("[ARCHIVER MODULE] Must be represented as vector3: --rotation-center \"<128,128,0>\""); |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | }); | 155 | }); |
@@ -174,11 +174,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
174 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); | 174 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); |
175 | if (mergeOar) archiveOptions.Add("merge", null); | 175 | if (mergeOar) archiveOptions.Add("merge", null); |
176 | if (skipAssets) archiveOptions.Add("skipAssets", null); | 176 | if (skipAssets) archiveOptions.Add("skipAssets", null); |
177 | if (forceTerrain) archiveOptions.Add("forceTerrain", null); | 177 | if (forceTerrain) archiveOptions.Add("force-terrain", null); |
178 | if (forceParcels) archiveOptions.Add("forceParcels", null); | 178 | if (forceParcels) archiveOptions.Add("force-parcels", null); |
179 | archiveOptions.Add("displacement", displacement); | 179 | archiveOptions.Add("displacement", displacement); |
180 | archiveOptions.Add("rotation", rotation); | 180 | archiveOptions.Add("rotation", rotation); |
181 | archiveOptions.Add("rotationCenter", rotationCenter); | 181 | archiveOptions.Add("rotation-center", rotationCenter); |
182 | 182 | ||
183 | if (mainParams.Count > 2) | 183 | if (mainParams.Count > 2) |
184 | { | 184 | { |