aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigurationMember.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/ConfigurationMember.cs')
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index c363ec0..9fdb046 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -31,7 +31,7 @@ using System.Globalization;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37 37
@@ -359,36 +359,36 @@ namespace OpenSim.Framework
359 } 359 }
360 errorMessage = "an IP Address (IPAddress)"; 360 errorMessage = "an IP Address (IPAddress)";
361 break; 361 break;
362 case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID: 362 case ConfigurationOption.ConfigurationTypes.TYPE_UUID:
363 LLUUID uuidResult; 363 UUID uuidResult;
364 if (LLUUID.TryParse(console_result, out uuidResult)) 364 if (UUID.TryParse(console_result, out uuidResult))
365 { 365 {
366 convertSuccess = true; 366 convertSuccess = true;
367 return_result = uuidResult; 367 return_result = uuidResult;
368 } 368 }
369 errorMessage = "a UUID (LLUUID)"; 369 errorMessage = "a UUID (UUID)";
370 break; 370 break;
371 case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE: 371 case ConfigurationOption.ConfigurationTypes.TYPE_UUID_NULL_FREE:
372 LLUUID uuidResult2; 372 UUID uuidResult2;
373 if (LLUUID.TryParse(console_result, out uuidResult2)) 373 if (UUID.TryParse(console_result, out uuidResult2))
374 { 374 {
375 convertSuccess = true; 375 convertSuccess = true;
376 376
377 if (uuidResult2 == LLUUID.Zero) 377 if (uuidResult2 == UUID.Zero)
378 uuidResult2 = LLUUID.Random(); 378 uuidResult2 = UUID.Random();
379 379
380 return_result = uuidResult2; 380 return_result = uuidResult2;
381 } 381 }
382 errorMessage = "a non-null UUID (LLUUID)"; 382 errorMessage = "a non-null UUID (UUID)";
383 break; 383 break;
384 case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3: 384 case ConfigurationOption.ConfigurationTypes.TYPE_Vector3:
385 LLVector3 vectorResult; 385 Vector3 vectorResult;
386 if (LLVector3.TryParse(console_result, out vectorResult)) 386 if (Vector3.TryParse(console_result, out vectorResult))
387 { 387 {
388 convertSuccess = true; 388 convertSuccess = true;
389 return_result = vectorResult; 389 return_result = vectorResult;
390 } 390 }
391 errorMessage = "a vector (LLVector3)"; 391 errorMessage = "a vector (Vector3)";
392 break; 392 break;
393 case ConfigurationOption.ConfigurationTypes.TYPE_UINT16: 393 case ConfigurationOption.ConfigurationTypes.TYPE_UINT16:
394 ushort ushortResult; 394 ushort ushortResult;