aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigurationMember.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-05-26 22:11:56 +0000
committerAdam Frisby2008-05-26 22:11:56 +0000
commit392375d34b931d8015db8c7bf8714d51ddbbd056 (patch)
tree80931a0ef59009871fb8498258c2c090f09e284f /OpenSim/Framework/ConfigurationMember.cs
parent* Potential fix for Mantis#167, 332 - MySQL Thread collision. (diff)
downloadopensim-SC_OLD-392375d34b931d8015db8c7bf8714d51ddbbd056.zip
opensim-SC_OLD-392375d34b931d8015db8c7bf8714d51ddbbd056.tar.gz
opensim-SC_OLD-392375d34b931d8015db8c7bf8714d51ddbbd056.tar.bz2
opensim-SC_OLD-392375d34b931d8015db8c7bf8714d51ddbbd056.tar.xz
* Assigns a random UUID to a region if the Sim UUID is null.
Diffstat (limited to 'OpenSim/Framework/ConfigurationMember.cs')
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs13
1 files changed, 13 insertions, 0 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))