aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs13
-rw-r--r--OpenSim/Framework/ConfigurationOption.cs1
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
3 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index b452794..cb434f0 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -368,6 +368,19 @@ namespace OpenSim.Framework
368 } 368 }
369 errorMessage = "a UUID (LLUUID)"; 369 errorMessage = "a UUID (LLUUID)";
370 break; 370 break;
371 case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE:
372 LLUUID uuidResult2;
373 if (LLUUID.TryParse(console_result, out uuidResult2))
374 {
375 convertSuccess = true;
376
377 if (uuidResult2 == LLUUID.Zero)
378 uuidResult2 = LLUUID.Random();
379
380 return_result = uuidResult2;
381 }
382 errorMessage = "a non-null UUID (LLUUID)";
383 break;
371 case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3: 384 case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3:
372 LLVector3 vectorResult; 385 LLVector3 vectorResult;
373 if (LLVector3.TryParse(console_result, out vectorResult)) 386 if (LLVector3.TryParse(console_result, out vectorResult))
diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
index 9bb5d8f..341d5e8 100644
--- a/OpenSim/Framework/ConfigurationOption.cs
+++ b/OpenSim/Framework/ConfigurationOption.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Framework
54 TYPE_BOOLEAN, 54 TYPE_BOOLEAN,
55 TYPE_BYTE, 55 TYPE_BYTE,
56 TYPE_LLUUID, 56 TYPE_LLUUID,
57 TYPE_LLUUID_NULL_FREE,
57 TYPE_LLVECTOR3, 58 TYPE_LLVECTOR3,
58 TYPE_FLOAT, 59 TYPE_FLOAT,
59 TYPE_DOUBLE 60 TYPE_DOUBLE
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index d9d41d6..9c27891 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -345,7 +345,7 @@ namespace OpenSim.Framework
345 345
346 public void loadConfigurationOptionsFromMe() 346 public void loadConfigurationOptionsFromMe()
347 { 347 {
348 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 348 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE,
349 "UUID of Region (Default is recommended, random UUID)", 349 "UUID of Region (Default is recommended, random UUID)",
350 RegionID.ToString(), true); 350 RegionID.ToString(), true);
351 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 351 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,