4 files changed, 21 insertions, 21 deletions

diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 4770017..0929172 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Configuration.HTTP
 
         public HTTPConfiguration()
         {
-            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");
+            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.Xml");
             xmlConfig = new XmlConfiguration();
         }
 
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 89f52cf..e3da962 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Configuration.XML
         {
             rootNode = doc.SelectSingleNode("Root");
             if (null == rootNode)
-                throw new Exception("Error: Invalid .xml File. Missing <Root>");
+                throw new Exception("Error: Invalid .Xml File. Missing <Root>");
 
             configNode = rootNode.SelectSingleNode("Config");
             if (null == configNode)
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;
diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
index 341d5e8..538ab62 100644
--- a/OpenSim/Framework/ConfigurationOption.cs
+++ b/OpenSim/Framework/ConfigurationOption.cs
@@ -53,9 +53,9 @@ namespace OpenSim.Framework
             TYPE_CHARACTER,
             TYPE_BOOLEAN,
             TYPE_BYTE,
-            TYPE_LLUUID,
-            TYPE_LLUUID_NULL_FREE,
-            TYPE_LLVECTOR3,
+            TYPE_UUID,
+            TYPE_UUID_NULL_FREE,
+            TYPE_Vector3,
             TYPE_FLOAT,
             TYPE_DOUBLE
         } ;
@@ -71,4 +71,4 @@ namespace OpenSim.Framework
         public bool configurationUseDefaultNoPrompt = false;
         public ConfigurationOptionShouldBeAsked shouldIBeAsked; //Should I be asked now? Based on previous answers
     }
-}
\ No newline at end of file
+}