aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2014-02-02 17:18:08 -0800
committerRobert Adams2014-02-02 17:18:08 -0800
commit8c6a0cb44abc74203350bafdd192a8520b9acf56 (patch)
treedd30c31ee319b8b96ed7dc3ea55ca92635c62cb4
parentChange new 'load oar' parameters to be hyphenated to be consistant with (diff)
downloadopensim-SC_OLD-8c6a0cb44abc74203350bafdd192a8520b9acf56.zip
opensim-SC_OLD-8c6a0cb44abc74203350bafdd192a8520b9acf56.tar.gz
opensim-SC_OLD-8c6a0cb44abc74203350bafdd192a8520b9acf56.tar.bz2
opensim-SC_OLD-8c6a0cb44abc74203350bafdd192a8520b9acf56.tar.xz
Really add the old parameter names to load oar to keep downward compatibiliy
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 9fa1fbd..a89fe1c 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -114,7 +114,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
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("force-terrain", delegate (string v) { forceTerrain = (v != null); }); 116 options.Add("force-terrain", delegate (string v) { forceTerrain = (v != null); });
117 options.Add("forceterrain", delegate (string v) { forceTerrain = (v != null); }); // downward compatibility
117 options.Add("force-parcels", delegate (string v) { forceParcels = (v != null); }); 118 options.Add("force-parcels", delegate (string v) { forceParcels = (v != null); });
119 options.Add("forceparcels", delegate (string v) { forceParcels = (v != null); }); // downward compatibility
118 options.Add("displacement=", delegate (string v) { 120 options.Add("displacement=", delegate (string v) {
119 try 121 try
120 { 122 {