From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
 JHurliman * This is a HUGE OMG update and will definitely have unknown side
 effects.. so this is really only for the strong hearted at this point. 
 Regular people should let the dust settle. * This has been tested to work
 with most basic functions. However..   make sure you back up 'everything'
 before using this.  It's that big! * Essentially we're back at square 1 in
 the testing phase..  so lets identify things that broke.

---
 OpenSim/Framework/ConfigurationMember.cs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Framework/ConfigurationMember.cs')

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;
 using System.Net;
 using System.Reflection;
 using System.Xml;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework.Console;
 
@@ -359,36 +359,36 @@ namespace OpenSim.Framework
                             }
                             errorMessage = "an IP Address (IPAddress)";
                             break;
-                        case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID:
-                            LLUUID uuidResult;
-                            if (LLUUID.TryParse(console_result, out uuidResult))
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UUID:
+                            UUID uuidResult;
+                            if (UUID.TryParse(console_result, out uuidResult))
                             {
                                 convertSuccess = true;
                                 return_result = uuidResult;
                             }
-                            errorMessage = "a UUID (LLUUID)";
+                            errorMessage = "a UUID (UUID)";
                             break;
-                        case ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE:
-                            LLUUID uuidResult2;
-                            if (LLUUID.TryParse(console_result, out uuidResult2))
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UUID_NULL_FREE:
+                            UUID uuidResult2;
+                            if (UUID.TryParse(console_result, out uuidResult2))
                             {
                                 convertSuccess = true;
 
-                                if (uuidResult2 == LLUUID.Zero)
-                                    uuidResult2 = LLUUID.Random();
+                                if (uuidResult2 == UUID.Zero)
+                                    uuidResult2 = UUID.Random();
 
                                 return_result = uuidResult2;
                             }
-                            errorMessage = "a non-null UUID (LLUUID)";
+                            errorMessage = "a non-null UUID (UUID)";
                             break;
-                        case ConfigurationOption.ConfigurationTypes.TYPE_LLVECTOR3:
-                            LLVector3 vectorResult;
-                            if (LLVector3.TryParse(console_result, out vectorResult))
+                        case ConfigurationOption.ConfigurationTypes.TYPE_Vector3:
+                            Vector3 vectorResult;
+                            if (Vector3.TryParse(console_result, out vectorResult))
                             {
                                 convertSuccess = true;
                                 return_result = vectorResult;
                             }
-                            errorMessage = "a vector (LLVector3)";
+                            errorMessage = "a vector (Vector3)";
                             break;
                         case ConfigurationOption.ConfigurationTypes.TYPE_UINT16:
                             ushort ushortResult;
-- 
cgit v1.1