51 files changed, 865 insertions, 865 deletions

diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index 690abd0..f38d578 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -25,17 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
     public abstract class AssetDataBase : IAssetProviderPlugin
     {
-        public abstract AssetBase FetchAsset(LLUUID uuid);
+        public abstract AssetBase FetchAsset(UUID uuid);
         public abstract void CreateAsset(AssetBase asset);
         public abstract void UpdateAsset(AssetBase asset);
-        public abstract bool ExistsAsset(LLUUID uuid);
+        public abstract bool ExistsAsset(UUID uuid);
 
         public abstract string Version { get; }
         public abstract string Name { get; }
diff --git a/OpenSim/Data/Base/AppearanceTableMapper.cs b/OpenSim/Data/Base/AppearanceTableMapper.cs
index 7964880..c1bb739 100644
--- a/OpenSim/Data/Base/AppearanceTableMapper.cs
+++ b/OpenSim/Data/Base/AppearanceTableMapper.cs
@@ -26,7 +26,7 @@
  */
 
 using System;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Data.Base;
 using OpenSim.Framework;
 
@@ -55,15 +55,15 @@ namespace OpenSim.Data.Base
             m_schema = rowMapperSchema;
 
             m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID",
-       delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.UUID; },
-       delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new LLUUID(value.ToString()); });
+       delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.Guid; },
+       delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<uint>("Serial",
                   delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.Serial; },
        delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.Serial = (int)value; });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem0",
-                 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.UUID; },
+                 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.Guid; },
       delegate(AppearanceRowMapper mapper, Guid value)
       {
           if (mapper.Object.Wearables == null)
@@ -74,121 +74,121 @@ namespace OpenSim.Data.Base
                   mapper.Object.Wearables[i] = new AvatarWearable();
               }
           }
-          mapper.Object.Wearables[0].ItemID = new LLUUID(value.ToString());
+          mapper.Object.Wearables[0].ItemID = new UUID(value.ToString());
       });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset0",
-                delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.UUID; },
+                delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.Guid; },
                 delegate(AppearanceRowMapper mapper, Guid value)
-                { mapper.Object.Wearables[0].AssetID = new LLUUID(value.ToString()); });
+                { mapper.Object.Wearables[0].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem1",
-                 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.UUID; },
-      delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new LLUUID(value.ToString()); });
+                 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.Guid; },
+      delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset1",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[1].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[1].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem2",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset2",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[2].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[2].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem3",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset3",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[3].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[3].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem4",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset4",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[4].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[4].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem5",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset5",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[5].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[5].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem6",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset6",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[6].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[6].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem7",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset7",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[7].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[7].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem8",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset8",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[8].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[8].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem9",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset9",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[9].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[9].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem10",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset10",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[10].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[10].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem11",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset11",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[11].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[11].AssetID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem12",
-              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.UUID; },
-   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new LLUUID(value.ToString()); });
+              delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.Guid; },
+   delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new UUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<Guid>("WearableAsset12",
-               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.UUID; },
+               delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.Guid; },
                delegate(AppearanceRowMapper mapper, Guid value)
-               { mapper.Object.Wearables[12].AssetID = new LLUUID(value.ToString()); });
+               { mapper.Object.Wearables[12].AssetID = new UUID(value.ToString()); });
 
         }
 
@@ -213,7 +213,7 @@ namespace OpenSim.Data.Base
         public bool Update(Guid userID, AvatarAppearance appearance)
         {
             AppearanceRowMapper mapper = CreateRowMapper(appearance);
-            return Update(appearance.Owner.UUID, mapper);
+            return Update(appearance.Owner.Guid, mapper);
         }
 
         /// <summary>
@@ -244,7 +244,7 @@ namespace OpenSim.Data.Base
         protected AppearanceRowMapper FromReader(BaseDataReader reader, AvatarAppearance appearance)
         {
             AppearanceRowMapper mapper = CreateRowMapper(appearance);
-            mapper.FillObject(reader);
+            mapper.FiPrimitive(reader);
             return mapper;
         }
 
@@ -256,7 +256,7 @@ namespace OpenSim.Data.Base
         public override AppearanceRowMapper FromReader(BaseDataReader reader)
         {
             AppearanceRowMapper mapper = CreateRowMapper();
-            mapper.FillObject(reader);
+            mapper.FiPrimitive(reader);
             return mapper;
         }
 
diff --git a/OpenSim/Data/Base/BaseRowMapper.cs b/OpenSim/Data/Base/BaseRowMapper.cs
index d07f9b3..d0e545b 100644
--- a/OpenSim/Data/Base/BaseRowMapper.cs
+++ b/OpenSim/Data/Base/BaseRowMapper.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Data.Base
     /// </summary>
     public abstract class BaseRowMapper
     {
-        public abstract void FillObject(BaseDataReader reader);
+        public abstract void FiPrimitive(BaseDataReader reader);
     }
 
     /// <summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Data.Base
         /// 
         /// </summary>
         /// <param name="reader"></param>
-        public override void FillObject(BaseDataReader reader)
+        public override void FiPrimitive(BaseDataReader reader)
         {
             foreach (BaseFieldMapper fieldMapper in m_schema.Fields.Values)
             {
diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
index 0b56d07..0fd4d86 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/GridDataBase.cs
@@ -25,17 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Data
 {
     public abstract class GridDataBase : IGridDataPlugin
     {
         public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
-        public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID);
+        public abstract RegionProfileData GetProfileByUUID(UUID UUID);
         public abstract RegionProfileData GetProfileByString(string regionName);
         public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
-        public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
+        public abstract bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
         public abstract DataResponse AddProfile(RegionProfileData profile);
         public abstract ReservationData GetReservationAtPoint(uint x, uint y);
         public abstract DataResponse UpdateProfile(RegionProfileData profile);
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index c77bbb7..c5f4ee1 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data
@@ -60,7 +60,7 @@ namespace OpenSim.Data
         /// </summary>
         /// <param name="UUID">A 128bit UUID</param>
         /// <returns>A sim profile</returns>
-        RegionProfileData GetProfileByLLUUID(LLUUID UUID);
+        RegionProfileData GetProfileByUUID(UUID UUID);
 
         /// <summary>
         /// Returns a sim profile from a string match
@@ -87,7 +87,7 @@ namespace OpenSim.Data
         /// <param name="regionHandle">The regionhandle sent by the sim</param>
         /// <param name="simrecvkey">The receiving key sent by the sim</param>
         /// <returns>Whether the sim has been authenticated</returns>
-        bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
+        bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
 
         /// <summary>
         /// Adds a new profile to the database
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index e10e3aa..ed1c91b 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -84,7 +84,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="assetID">the asset UUID</param>
         /// <returns></returns>
-        override public AssetBase FetchAsset(LLUUID assetID)
+        override public AssetBase FetchAsset(UUID assetID)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
             param["id"] = assetID.ToString();
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="asset">the asset</param>
         override public void CreateAsset(AssetBase asset)
         {
-            if (ExistsAsset((LLUUID) asset.FullID))
+            if (ExistsAsset((UUID) asset.FullID))
             {
                 return;
             }
@@ -181,7 +181,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="uuid"></param>
         /// <returns>true if exist.</returns>
-        override public bool ExistsAsset(LLUUID uuid)
+        override public bool ExistsAsset(UUID uuid)
         {
             if (FetchAsset(uuid) != null)
             {
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 74eecd8..b42c67f 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="regionID">region ID.</param>
         /// <returns></returns>
-        public EstateSettings LoadEstateSettings(LLUUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID)
         {
             EstateSettings es = new EstateSettings();
 
@@ -128,10 +128,10 @@ namespace OpenSim.Data.MSSQL
                                 else
                                     _FieldMap[name].SetValue(es, false);
                             }
-                            else if (_FieldMap[name].GetValue(es) is LLUUID)
+                            else if (_FieldMap[name].GetValue(es) is UUID)
                             {
-                                LLUUID uuid;
-                                LLUUID.TryParse(reader[name].ToString(), out uuid);
+                                UUID uuid;
+                                UUID.TryParse(reader[name].ToString(), out uuid);
 
                                 _FieldMap[name].SetValue(es, uuid);
                             }
@@ -333,8 +333,8 @@ namespace OpenSim.Data.MSSQL
                     {
                         EstateBan eb = new EstateBan();
 
-                        LLUUID uuid;
-                        LLUUID.TryParse(reader["bannedUUID"].ToString(), out uuid);
+                        UUID uuid;
+                        UUID.TryParse(reader["bannedUUID"].ToString(), out uuid);
 
                         eb.bannedUUID = uuid;
                         eb.bannedIP = "0.0.0.0";
@@ -345,9 +345,9 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        private LLUUID[] LoadUUIDList(uint estateID, string table)
+        private UUID[] LoadUUIDList(uint estateID, string table)
         {
-            List<LLUUID> uuids = new List<LLUUID>();
+            List<UUID> uuids = new List<UUID>();
 
             string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
 
@@ -361,8 +361,8 @@ namespace OpenSim.Data.MSSQL
                     {
                         // EstateBan eb = new EstateBan();
 
-                        LLUUID uuid;
-                        LLUUID.TryParse(reader["uuid"].ToString(), out uuid);
+                        UUID uuid;
+                        UUID.TryParse(reader["uuid"].ToString(), out uuid);
 
                         uuids.Add(uuid);
                     }
@@ -399,7 +399,7 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        private void SaveUUIDList(uint estateID, string table, LLUUID[] data)
+        private void SaveUUIDList(uint estateID, string table, UUID[] data)
         {
             //Delete first
             string sql = string.Format("delete from {0} where EstateID = @EstateID", table);
@@ -416,7 +416,7 @@ namespace OpenSim.Data.MSSQL
 
                 bool createParamOnce = true;
 
-                foreach (LLUUID uuid in data)
+                foreach (UUID uuid in data)
                 {
                     if (createParamOnce)
                     {
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 423d4aa..47edc4b 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="uuid">The region UUID</param>
         /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
+        override public RegionProfileData GetProfileByUUID(UUID uuid)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
             param["uuid"] = uuid.ToString();
@@ -284,7 +284,7 @@ namespace OpenSim.Data.MSSQL
 
             parameters["regionHandle"] = profile.regionHandle.ToString();
             parameters["regionName"] = profile.regionName;
-            parameters["uuid"] = profile.UUID.ToString();
+            parameters["uuid"] = profile.ToString();
             parameters["regionRecvKey"] = profile.regionRecvKey;
             parameters["regionSecret"] = profile.regionSecret;
             parameters["regionSendKey"] = profile.regionSendKey;
@@ -352,7 +352,7 @@ namespace OpenSim.Data.MSSQL
 
             parameters["regionHandle"] = profile.regionHandle.ToString();
             parameters["regionName"] = profile.regionName;
-            parameters["uuid"] = profile.UUID.ToString();
+            parameters["uuid"] = profile.ToString();
             parameters["regionRecvKey"] = profile.regionRecvKey;
             parameters["regionSecret"] = profile.regionSecret;
             parameters["regionSendKey"] = profile.regionSendKey;
@@ -403,14 +403,14 @@ namespace OpenSim.Data.MSSQL
         /// <param name="handle">The attempted regionHandle of the challenger</param>
         /// <param name="authkey">The secret</param>
         /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
+        override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
         {
             bool throwHissyFit = false; // Should be true by 1.0
 
             if (throwHissyFit)
                 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
 
-            RegionProfileData data = GetProfileByLLUUID(uuid);
+            RegionProfileData data = GetProfileByUUID(uuid);
 
             return (handle == data.regionHandle && authkey == data.regionSecret);
         }
@@ -424,7 +424,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="authhash"></param>
         /// <param name="challenge"></param>
         /// <returns></returns>
-        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
+        public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
         {
             // SHA512Managed HashProvider = new SHA512Managed();
             // Encoding TextProvider = new UTF8Encoding();
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 9e60b16..e7df7c1 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -167,7 +167,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="folderID">The folder to search</param>
         /// <returns>A list containing inventory items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
             try
             {
@@ -201,13 +201,13 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="user">The user whos inventory is to be searched</param>
         /// <returns>A list of folder objects</returns>
-        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
+        public List<InventoryFolderBase> getUserRootFolders(UUID user)
         {
             try
             {
                 Dictionary<string, string> param = new Dictionary<string, string>();
                 param["uuid"] = user.ToString();
-                param["zero"] = LLUUID.Zero.ToString();
+                param["zero"] = UUID.Zero.ToString();
 
                 using (IDbCommand result =
                     database.Query(
@@ -235,13 +235,13 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="user">the User UUID</param>
         /// <returns></returns>
-        public InventoryFolderBase getUserRootFolder(LLUUID user)
+        public InventoryFolderBase getUserRootFolder(UUID user)
         {
             try
             {
                 Dictionary<string, string> param = new Dictionary<string, string>();
                 param["uuid"] = user.ToString();
-                param["zero"] = LLUUID.Zero.ToString();
+                param["zero"] = UUID.Zero.ToString();
 
                 using (IDbCommand result =
                     database.Query(
@@ -281,7 +281,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="parentID">The folder to search</param>
         /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
             try
             {
@@ -318,23 +318,23 @@ namespace OpenSim.Data.MSSQL
             {
                 InventoryItemBase item = new InventoryItemBase();
 
-                item.ID = new LLUUID((string) reader["inventoryID"]);
-                item.AssetID = new LLUUID((string) reader["assetID"]);
+                item.ID = new UUID((string) reader["inventoryID"]);
+                item.AssetID = new UUID((string) reader["assetID"]);
                 item.AssetType = (int) reader["assetType"];
-                item.Folder = new LLUUID((string) reader["parentFolderID"]);
-                item.Owner = new LLUUID((string) reader["avatarID"]);
+                item.Folder = new UUID((string) reader["parentFolderID"]);
+                item.Owner = new UUID((string) reader["avatarID"]);
                 item.Name = (string) reader["inventoryName"];
                 item.Description = (string) reader["inventoryDescription"];
                 item.NextPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryNextPermissions"]);
                 item.CurrentPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryCurrentPermissions"]);
                 item.InvType = (int) reader["invType"];
-                item.Creator = new LLUUID((string) reader["creatorID"]);
+                item.Creator = new UUID((string) reader["creatorID"]);
                 item.BasePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryBasePermissions"]);
                 item.EveryOnePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryEveryOnePermissions"]);
                 item.SalePrice = (int) reader["salePrice"];
                 item.SaleType = Convert.ToByte(reader["saleType"]);
                 item.CreationDate = (int) reader["creationDate"];
-                item.GroupID = new LLUUID(reader["groupID"].ToString());
+                item.GroupID = new UUID(reader["groupID"].ToString());
                 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
                 item.Flags = ConvertInt32BitFieldToUint32((int)reader["flags"]);
 
@@ -353,7 +353,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="item">The item to return</param>
         /// <returns>An inventory item</returns>
-        public InventoryItemBase getInventoryItem(LLUUID itemID)
+        public InventoryItemBase getInventoryItem(UUID itemID)
         {
             try
             {
@@ -389,9 +389,9 @@ namespace OpenSim.Data.MSSQL
             try
             {
                 InventoryFolderBase folder = new InventoryFolderBase();
-                folder.Owner = new LLUUID((string) reader["agentID"]);
-                folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
-                folder.ID = new LLUUID((string) reader["folderID"]);
+                folder.Owner = new UUID((string) reader["agentID"]);
+                folder.ParentID = new UUID((string) reader["parentFolderID"]);
+                folder.ID = new UUID((string) reader["folderID"]);
                 folder.Name = (string) reader["folderName"];
                 folder.Type = (short) reader["type"];
                 folder.Version = Convert.ToUInt16(reader["version"]);
@@ -410,7 +410,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="folder">The folder to return</param>
         /// <returns>A folder class</returns>
-        public InventoryFolderBase getInventoryFolder(LLUUID folderID)
+        public InventoryFolderBase getInventoryFolder(UUID folderID)
         {
             try
             {
@@ -556,7 +556,7 @@ namespace OpenSim.Data.MSSQL
         /// Delete an item in inventory database
         /// </summary>
         /// <param name="item">the item UUID</param>
-        public void deleteInventoryItem(LLUUID itemID)
+        public void deleteInventoryItem(UUID itemID)
         {
             try
             {
@@ -679,7 +679,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="folders">list where folders will be appended</param>
         /// <param name="parentID">ID of parent</param>
-        protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID)
+        protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
         {
             List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID);
 
@@ -688,7 +688,7 @@ namespace OpenSim.Data.MSSQL
         }
 
         // See IInventoryDataPlugin
-        public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID)
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
         {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             getInventoryFolders(ref folders, parentID);
@@ -703,7 +703,7 @@ namespace OpenSim.Data.MSSQL
         /// Delete a folder in inventory databasae
         /// </summary>
         /// <param name="folderID">the folder UUID</param>
-        protected void deleteOneFolder(LLUUID folderID)
+        protected void deleteOneFolder(UUID folderID)
         {
             try
             {
@@ -725,7 +725,7 @@ namespace OpenSim.Data.MSSQL
         /// Delete an item in inventory database
         /// </summary>
         /// <param name="folderID">the item ID</param>
-        protected void deleteItemsInFolder(LLUUID folderID)
+        protected void deleteItemsInFolder(UUID folderID)
         {
             try
             {
@@ -749,7 +749,7 @@ namespace OpenSim.Data.MSSQL
         /// Delete an inventory folder
         /// </summary>
         /// <param name="folderId">Id of folder to delete</param>
-        public void deleteInventoryFolder(LLUUID folderID)
+        public void deleteInventoryFolder(UUID folderID)
         {
             // lock (database)
             {
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 535cf33..abbcddf 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -220,7 +220,7 @@ namespace OpenSim.Data.MSSQL
             {
                 return SqlDbType.Bit;
             }
-            if (type == typeof(LLUUID))
+            if (type == typeof(UUID))
             {
                 return SqlDbType.VarChar;
             }
@@ -244,7 +244,7 @@ namespace OpenSim.Data.MSSQL
         {
             Type valueType = value.GetType();
 
-            if (valueType == typeof(LLUUID))
+            if (valueType == typeof(UUID))
             {
                 return value.ToString();
             }
@@ -335,7 +335,7 @@ namespace OpenSim.Data.MSSQL
                 // Region Main
                 regionprofile.regionHandle = Convert.ToUInt64(reader["regionHandle"]);
                 regionprofile.regionName = (string)reader["regionName"];
-                regionprofile.UUID = new LLUUID((string)reader["uuid"]);
+                regionprofile.UUID = new UUID((string)reader["uuid"]);
 
                 // Secrets
                 regionprofile.regionRecvKey = (string)reader["regionRecvKey"];
@@ -372,16 +372,16 @@ namespace OpenSim.Data.MSSQL
                 regionprofile.regionUserURI = (string)reader["regionUserURI"];
                 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
                 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
-                regionprofile.owner_uuid = new LLUUID((string) reader["owner_uuid"]);
+                regionprofile.owner_uuid = new UUID((string) reader["owner_uuid"]);
                 // World Map Addition
                 string tempRegionMap = reader["regionMapTexture"].ToString();
                 if (tempRegionMap != String.Empty)
                 {
-                    regionprofile.regionMapTextureID = new LLUUID(tempRegionMap);
+                    regionprofile.regionMapTextureID = new UUID(tempRegionMap);
                 }
                 else
                 {
-                    regionprofile.regionMapTextureID = new LLUUID();
+                    regionprofile.regionMapTextureID = new UUID();
                 }
             }
             else
@@ -403,7 +403,7 @@ namespace OpenSim.Data.MSSQL
 
             if (reader.Read())
             {
-                retval.ID = new LLUUID((string)reader["UUID"]);
+                retval.ID = new UUID((string)reader["UUID"]);
                 retval.FirstName = (string)reader["username"];
                 retval.SurName = (string)reader["lastname"];
 
@@ -411,11 +411,11 @@ namespace OpenSim.Data.MSSQL
                 retval.PasswordSalt = (string)reader["passwordSalt"];
 
                 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
-                retval.HomeLocation = new LLVector3(
+                retval.HomeLocation = new Vector3(
                     Convert.ToSingle(reader["homeLocationX"].ToString()),
                     Convert.ToSingle(reader["homeLocationY"].ToString()),
                     Convert.ToSingle(reader["homeLocationZ"].ToString()));
-                retval.HomeLookAt = new LLVector3(
+                retval.HomeLookAt = new Vector3(
                     Convert.ToSingle(reader["homeLookAtX"].ToString()),
                     Convert.ToSingle(reader["homeLookAtY"].ToString()),
                     Convert.ToSingle(reader["homeLookAtZ"].ToString()));
@@ -432,9 +432,9 @@ namespace OpenSim.Data.MSSQL
                 retval.AboutText = (string)reader["profileAboutText"];
                 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
 
-                retval.Image = new LLUUID((string)reader["profileImage"]);
-                retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]);
-                retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]);
+                retval.Image = new UUID((string)reader["profileImage"]);
+                retval.FirstLifeImage = new UUID((string)reader["profileFirstImage"]);
+                retval.WebLoginKey = new UUID((string)reader["webLoginKey"]);
             }
             else
             {
@@ -455,9 +455,9 @@ namespace OpenSim.Data.MSSQL
             if (reader.Read())
             {
                 // Agent IDs
-                retval.ProfileID = new LLUUID((string)reader["UUID"]);
-                retval.SessionID = new LLUUID((string)reader["sessionID"]);
-                retval.SecureSessionID = new LLUUID((string)reader["secureSessionID"]);
+                retval.ProfileID = new UUID((string)reader["UUID"]);
+                retval.SessionID = new UUID((string)reader["sessionID"]);
+                retval.SecureSessionID = new UUID((string)reader["secureSessionID"]);
 
                 // Agent Who?
                 retval.AgentIP = (string)reader["agentIP"];
@@ -471,8 +471,8 @@ namespace OpenSim.Data.MSSQL
                 // Current position
                 retval.Region = (string)reader["currentRegion"];
                 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
-                LLVector3 tmp_v;
-                LLVector3.TryParse((string)reader["currentPos"], out tmp_v);
+                Vector3 tmp_v;
+                Vector3.TryParse((string)reader["currentPos"], out tmp_v);
                 retval.Position = tmp_v;
 
             }
@@ -497,7 +497,7 @@ namespace OpenSim.Data.MSSQL
                 asset = new AssetBase();
                 asset.Data = (byte[])reader["data"];
                 asset.Description = (string)reader["description"];
-                asset.FullID = new LLUUID((string)reader["id"]);
+                asset.FullID = new UUID((string)reader["id"]);
                 asset.Local = Convert.ToBoolean(reader["local"]); // ((sbyte)reader["local"]) != 0 ? true : false;
                 asset.Name = (string)reader["name"];
                 asset.Type = Convert.ToSByte(reader["assetType"]);
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 46aa6c9..d267e41 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -174,12 +174,12 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="regionUUID">The region UUID.</param>
         /// <returns></returns>
-        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
-            Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>();
+            Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
 
             //Retrieve all values of current region
-            RetrievePrimsDataForRegion(regionUUID, LLUUID.Zero, "");
+            RetrievePrimsDataForRegion(regionUUID, UUID.Zero, "");
 
             List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
 
@@ -235,7 +235,7 @@ namespace OpenSim.Data.MSSQL
                                     "No shape found for prim in storage, so setting default box shape");
                                 prim.Shape = PrimitiveBaseShape.Default;
                             }
-                            createdObjects[new LLUUID(objID)].AddPart(prim);
+                            createdObjects[new UUID(objID)].AddPart(prim);
                         }
 
                         LoadItems(prim);
@@ -292,7 +292,7 @@ namespace OpenSim.Data.MSSQL
 //                        }
 //                        else
 //                        {
-//                            createdObjects[new LLUUID(objID)].AddPart(prim);
+//                            createdObjects[new UUID(objID)].AddPart(prim);
 //                        }
 //                    }
 //                }
@@ -307,7 +307,7 @@ namespace OpenSim.Data.MSSQL
 //                {
 //                    while (readerShapes.Read())
 //                    {
-//                        LLUUID UUID = new LLUUID((string) readerShapes["UUID"]);
+//                        UUID UUID = new UUID((string) readerShapes["UUID"]);
 //
 //                        foreach (SceneObjectGroup objectGroup in createdObjects.Values)
 //                        {
@@ -324,7 +324,7 @@ namespace OpenSim.Data.MSSQL
             #endregion
         }
 
-        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             //Retrieve all values of current region, and current scene/or prims
             //Build primID's, we use IN so I can select all prims from objgroup
@@ -341,9 +341,9 @@ namespace OpenSim.Data.MSSQL
 
             foreach (SceneObjectPart prim in obj.Children.Values)
             {
-                if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0
-                    && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0
-                    && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0)
+                if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
+                    && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
+                    && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
                 {
                     lock (_PrimsDataSet)
                     {
@@ -391,7 +391,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="objectID">id of scenegroup</param>
         /// <param name="regionUUID">regionUUID (is this used anyway</param>
-        public void RemoveObject(LLUUID objectID, LLUUID regionUUID)
+        public void RemoveObject(UUID objectID, UUID regionUUID)
         {
             _Log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", objectID, regionUUID);
 
@@ -418,7 +418,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="primID"></param>
         /// <param name="items"></param>
-        public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             _Log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
 
@@ -456,7 +456,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="regionID">regionID.</param>
         /// <returns></returns>
-        public double[,] LoadTerrain(LLUUID regionID)
+        public double[,] LoadTerrain(UUID regionID)
         {
             double[,] terrain = new double[256, 256];
             terrain.Initialize();
@@ -501,7 +501,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="terrain">terrain map data.</param>
         /// <param name="regionID">regionID.</param>
-        public void StoreTerrain(double[,] terrain, LLUUID regionID)
+        public void StoreTerrain(double[,] terrain, UUID regionID)
         {
             int revision = Util.UnixTimeSinceEpoch();
 
@@ -532,7 +532,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="regionUUID">The region UUID.</param>
         /// <returns></returns>
-        public List<LandData> LoadLandObjects(LLUUID regionUUID)
+        public List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landDataForRegion = new List<LandData>();
 
@@ -617,7 +617,7 @@ VALUES
         /// Removes a land object from DB.
         /// </summary>
         /// <param name="globalID">UUID of landobject</param>
-        public void RemoveLandObject(LLUUID globalID)
+        public void RemoveLandObject(UUID globalID)
         {
             using (AutoClosingSqlCommand cmd = _Database.Query("delete from land where UUID=@UUID"))
             {
@@ -637,7 +637,7 @@ VALUES
         /// </summary>
         /// <param name="regionUUID">The region UUID.</param>
         /// <returns></returns>
-        public RegionSettings LoadRegionSettings(LLUUID regionUUID)
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             string sql = "select * from regionsettings where regionUUID = @regionUUID";
             RegionSettings regionSettings;
@@ -801,7 +801,7 @@ VALUES
             //TODO change this is some more generic code so we doesnt have to change it every time a new field is added?
             RegionSettings newSettings = new RegionSettings();
 
-            newSettings.RegionUUID = new LLUUID((string)row["regionUUID"]);
+            newSettings.RegionUUID = new UUID((string)row["regionUUID"]);
             newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
             newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
             newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
@@ -815,10 +815,10 @@ VALUES
             newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
             newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
             newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
-            newSettings.TerrainTexture1 = new LLUUID((String)row["terrain_texture_1"]);
-            newSettings.TerrainTexture2 = new LLUUID((String)row["terrain_texture_2"]);
-            newSettings.TerrainTexture3 = new LLUUID((String)row["terrain_texture_3"]);
-            newSettings.TerrainTexture4 = new LLUUID((String)row["terrain_texture_4"]);
+            newSettings.TerrainTexture1 = new UUID((String)row["terrain_texture_1"]);
+            newSettings.TerrainTexture2 = new UUID((String)row["terrain_texture_2"]);
+            newSettings.TerrainTexture3 = new UUID((String)row["terrain_texture_3"]);
+            newSettings.TerrainTexture4 = new UUID((String)row["terrain_texture_4"]);
             newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
             newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
             newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
@@ -834,7 +834,7 @@ VALUES
             newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
-            newSettings.Covenant = new LLUUID((String)row["covenant"]);
+            newSettings.Covenant = new UUID((String)row["covenant"]);
 
             return newSettings;
         }
@@ -848,7 +848,7 @@ VALUES
         {
             LandData newData = new LandData();
 
-            newData.GlobalID = new LLUUID((String)row["UUID"]);
+            newData.GlobalID = new UUID((String)row["UUID"]);
             newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
 
             // Bitmap is a byte[512]
@@ -864,41 +864,41 @@ VALUES
             //Enum libsecondlife.Parcel.ParcelCategory
             newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
             newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
-            newData.GroupID = new LLUUID((String)row["GroupUUID"]);
+            newData.GroupID = new UUID((String)row["GroupUUID"]);
             newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
             newData.Status = (Parcel.ParcelStatus)Convert.ToInt32(row["LandStatus"]);
             //Enum. libsecondlife.Parcel.ParcelStatus
             newData.Flags = Convert.ToUInt32(row["LandFlags"]);
             newData.LandingType = Convert.ToByte(row["LandingType"]);
             newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]);
-            newData.MediaID = new LLUUID((String)row["MediaTextureUUID"]);
+            newData.MediaID = new UUID((String)row["MediaTextureUUID"]);
             newData.MediaURL = (String)row["MediaURL"];
             newData.MusicURL = (String)row["MusicURL"];
             newData.PassHours = Convert.ToSingle(row["PassHours"]);
             newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
 
-            LLUUID authedbuyer;
-            LLUUID snapshotID;
+            UUID authedbuyer;
+            UUID snapshotID;
 
-            if (LLUUID.TryParse((string)row["AuthBuyerID"], out authedbuyer))
+            if (UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer))
                 newData.AuthBuyerID = authedbuyer;
 
-            if (LLUUID.TryParse((string)row["SnapshotUUID"], out snapshotID))
+            if (UUID.TryParse((string)row["SnapshotUUID"], out snapshotID))
                 newData.SnapshotID = snapshotID;
 
             try
             {
                 newData.UserLocation =
-                    new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
+                    new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
                                   Convert.ToSingle(row["UserLocationZ"]));
                 newData.UserLookAt =
-                    new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
+                    new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
                                   Convert.ToSingle(row["UserLookAtZ"]));
             }
             catch (InvalidCastException)
             {
-                newData.UserLocation = LLVector3.Zero;
-                newData.UserLookAt = LLVector3.Zero;
+                newData.UserLocation = Vector3.Zero;
+                newData.UserLookAt = Vector3.Zero;
                 _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
             }
 
@@ -915,7 +915,7 @@ VALUES
         private static ParcelManager.ParcelAccessEntry buildLandAccessData(IDataRecord row)
         {
             ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-            entry.AgentID = new LLUUID((string)row["AccessUUID"]);
+            entry.AgentID = new UUID((string)row["AccessUUID"]);
             entry.Flags = (ParcelManager.AccessList)Convert.ToInt32(row["Flags"]);
             entry.Time = new DateTime();
             return entry;
@@ -930,7 +930,7 @@ VALUES
         {
             SceneObjectPart prim = new SceneObjectPart();
 
-            prim.UUID = new LLUUID((String)row["UUID"]);
+            prim.UUID = new UUID((String)row["UUID"]);
             // explicit conversion of integers is required, which sort
             // of sucks.  No idea if there is a shortcut here or not.
             prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -943,54 +943,54 @@ VALUES
             prim.TouchName = (String)row["TouchName"];
             // permissions
             prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
-            prim.CreatorID = new LLUUID((String)row["CreatorID"]);
-            prim.OwnerID = new LLUUID((String)row["OwnerID"]);
-            prim.GroupID = new LLUUID((String)row["GroupID"]);
-            prim.LastOwnerID = new LLUUID((String)row["LastOwnerID"]);
+            prim.CreatorID = new UUID((String)row["CreatorID"]);
+            prim.OwnerID = new UUID((String)row["OwnerID"]);
+            prim.GroupID = new UUID((String)row["GroupID"]);
+            prim.LastOwnerID = new UUID((String)row["LastOwnerID"]);
             prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
             prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
             prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
             prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
             prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
             // vectors
-            prim.OffsetPosition = new LLVector3(
+            prim.OffsetPosition = new Vector3(
                 Convert.ToSingle(row["PositionX"]),
                 Convert.ToSingle(row["PositionY"]),
                 Convert.ToSingle(row["PositionZ"])
                 );
-            prim.GroupPosition = new LLVector3(
+            prim.GroupPosition = new Vector3(
                 Convert.ToSingle(row["GroupPositionX"]),
                 Convert.ToSingle(row["GroupPositionY"]),
                 Convert.ToSingle(row["GroupPositionZ"])
                 );
-            prim.Velocity = new LLVector3(
+            prim.Velocity = new Vector3(
                 Convert.ToSingle(row["VelocityX"]),
                 Convert.ToSingle(row["VelocityY"]),
                 Convert.ToSingle(row["VelocityZ"])
                 );
-            prim.AngularVelocity = new LLVector3(
+            prim.AngularVelocity = new Vector3(
                 Convert.ToSingle(row["AngularVelocityX"]),
                 Convert.ToSingle(row["AngularVelocityY"]),
                 Convert.ToSingle(row["AngularVelocityZ"])
                 );
-            prim.Acceleration = new LLVector3(
+            prim.Acceleration = new Vector3(
                 Convert.ToSingle(row["AccelerationX"]),
                 Convert.ToSingle(row["AccelerationY"]),
                 Convert.ToSingle(row["AccelerationZ"])
                 );
             // quaternions
-            prim.RotationOffset = new LLQuaternion(
+            prim.RotationOffset = new Quaternion(
                 Convert.ToSingle(row["RotationX"]),
                 Convert.ToSingle(row["RotationY"]),
                 Convert.ToSingle(row["RotationZ"]),
                 Convert.ToSingle(row["RotationW"])
                 );
-            prim.SitTargetPositionLL = new LLVector3(
+            prim.SitTargetPositionLL = new Vector3(
                 Convert.ToSingle(row["SitTargetOffsetX"]),
                 Convert.ToSingle(row["SitTargetOffsetY"]),
                 Convert.ToSingle(row["SitTargetOffsetZ"])
                 );
-            prim.SitTargetOrientationLL = new LLQuaternion(
+            prim.SitTargetOrientationLL = new Quaternion(
                 Convert.ToSingle(row["SitTargetOrientX"]),
                 Convert.ToSingle(row["SitTargetOrientY"]),
                 Convert.ToSingle(row["SitTargetOrientZ"]),
@@ -1003,14 +1003,14 @@ VALUES
             prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]);
             prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]);
 
-            prim.Sound = new LLUUID(row["LoopedSound"].ToString());
+            prim.Sound = new UUID(row["LoopedSound"].ToString());
             prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
             prim.SoundFlags = 1; // If it's persisted at all, it's looped
 
             if (row["TextureAnimation"] != null && row["TextureAnimation"] != DBNull.Value)
                 prim.TextureAnimation = (Byte[])row["TextureAnimation"];
 
-            prim.RotationalVelocity = new LLVector3(
+            prim.RotationalVelocity = new Vector3(
                 Convert.ToSingle(row["OmegaX"]),
                 Convert.ToSingle(row["OmegaY"]),
                 Convert.ToSingle(row["OmegaZ"])
@@ -1019,13 +1019,13 @@ VALUES
             // TODO: Rotation
             // OmegaX, OmegaY, OmegaZ
 
-            prim.SetCameraEyeOffset(new LLVector3(
+            prim.SetCameraEyeOffset(new Vector3(
                                         Convert.ToSingle(row["CameraEyeOffsetX"]),
                                         Convert.ToSingle(row["CameraEyeOffsetY"]),
                                         Convert.ToSingle(row["CameraEyeOffsetZ"])
                                         ));
 
-            prim.SetCameraAtOffset(new LLVector3(
+            prim.SetCameraAtOffset(new Vector3(
                                        Convert.ToSingle(row["CameraAtOffsetX"]),
                                        Convert.ToSingle(row["CameraAtOffsetY"]),
                                        Convert.ToSingle(row["CameraAtOffsetZ"])
@@ -1056,7 +1056,7 @@ VALUES
         private static PrimitiveBaseShape buildShape(DataRow row)
         {
             PrimitiveBaseShape s = new PrimitiveBaseShape();
-            s.Scale = new LLVector3(
+            s.Scale = new Vector3(
                 Convert.ToSingle(row["ScaleX"]),
                 Convert.ToSingle(row["ScaleY"]),
                 Convert.ToSingle(row["ScaleZ"])
@@ -1108,10 +1108,10 @@ VALUES
         {
             TaskInventoryItem taskItem = new TaskInventoryItem();
 
-            taskItem.ItemID = new LLUUID((String)row["itemID"]);
-            taskItem.ParentPartID = new LLUUID((String)row["primID"]);
-            taskItem.AssetID = new LLUUID((String)row["assetID"]);
-            taskItem.ParentID = new LLUUID((String)row["parentFolderID"]);
+            taskItem.ItemID = new UUID((String)row["itemID"]);
+            taskItem.ParentPartID = new UUID((String)row["primID"]);
+            taskItem.AssetID = new UUID((String)row["assetID"]);
+            taskItem.ParentID = new UUID((String)row["parentFolderID"]);
 
             taskItem.InvType = Convert.ToInt32(row["invType"]);
             taskItem.Type = Convert.ToInt32(row["assetType"]);
@@ -1119,10 +1119,10 @@ VALUES
             taskItem.Name = (String)row["name"];
             taskItem.Description = (String)row["description"];
             taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
-            taskItem.CreatorID = new LLUUID((String)row["creatorID"]);
-            taskItem.OwnerID = new LLUUID((String)row["ownerID"]);
-            taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]);
-            taskItem.GroupID = new LLUUID((String)row["groupID"]);
+            taskItem.CreatorID = new UUID((String)row["creatorID"]);
+            taskItem.OwnerID = new UUID((String)row["ownerID"]);
+            taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
+            taskItem.GroupID = new UUID((String)row["groupID"]);
 
             taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
             taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
@@ -1225,7 +1225,7 @@ VALUES
         /// <param name="land">land parameters.</param>
         /// <param name="regionUUID">region UUID.</param>
         /// <returns></returns>
-        private SqlParameter[] CreateLandParameters(LandData land, LLUUID regionUUID)
+        private SqlParameter[] CreateLandParameters(LandData land, UUID regionUUID)
         {
             SqlParameter[] parameters = new SqlParameter[32];
 
@@ -1274,7 +1274,7 @@ VALUES
         /// <param name="parcelAccessEntry">parcel access entry.</param>
         /// <param name="parcelID">parcel ID.</param>
         /// <returns></returns>
-        private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, LLUUID parcelID)
+        private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, UUID parcelID)
         {
             SqlParameter[] parameters = new SqlParameter[3];
 
@@ -1292,7 +1292,7 @@ VALUES
         /// <param name="prim">prim data.</param>
         /// <param name="sceneGroupID">scenegroup ID.</param>
         /// <param name="regionUUID">regionUUID.</param>
-        private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
+        private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
         {
             row["UUID"] = prim.UUID.ToString();
             row["RegionUUID"] = regionUUID.ToString();
@@ -1340,12 +1340,12 @@ VALUES
             row["RotationW"] = prim.RotationOffset.W;
 
             // Sit target
-            LLVector3 sitTargetPos = prim.SitTargetPositionLL;
+            Vector3 sitTargetPos = prim.SitTargetPositionLL;
             row["SitTargetOffsetX"] = sitTargetPos.X;
             row["SitTargetOffsetY"] = sitTargetPos.Y;
             row["SitTargetOffsetZ"] = sitTargetPos.Z;
 
-            LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
+            Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
             row["SitTargetOrientW"] = sitTargetOrient.W;
             row["SitTargetOrientX"] = sitTargetOrient.X;
             row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1364,7 +1364,7 @@ VALUES
             }
             else
             {
-                row["LoopedSound"] = LLUUID.Zero;
+                row["LoopedSound"] = UUID.Zero;
                 row["LoopedSoundGain"] = 0.0f;
             }
 
@@ -1446,13 +1446,13 @@ VALUES
 
         #endregion
 
-        private void RetrievePrimsDataForRegion(LLUUID regionUUID, LLUUID sceneGroupID, string primID)
+        private void RetrievePrimsDataForRegion(UUID regionUUID, UUID sceneGroupID, string primID)
         {
             using (SqlConnection connection = _Database.DatabaseConnection())
             {
                 _PrimDataAdapter.SelectCommand.Connection = connection;
                 _PrimDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString();
-                if (sceneGroupID != LLUUID.Zero)
+                if (sceneGroupID != UUID.Zero)
                     _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString();
                 else
                     _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%";
@@ -1462,7 +1462,7 @@ VALUES
 
                 _ShapeDataAdapter.SelectCommand.Connection = connection;
                 _ShapeDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString();
-                if (sceneGroupID != LLUUID.Zero)
+                if (sceneGroupID != UUID.Zero)
                     _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString();
                 else
                     _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%";
@@ -1472,7 +1472,7 @@ VALUES
 
                 _ItemsDataAdapter.SelectCommand.Connection = connection;
                 _ItemsDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString();
-                if (sceneGroupID != LLUUID.Zero)
+                if (sceneGroupID != UUID.Zero)
                     _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString();
                 else
                     _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%";
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index cfe5f50..9118012 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -183,13 +183,13 @@ namespace OpenSim.Data.MSSQL
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <param name="friend">Friend's UUID</param>
         /// <param name="perms">Permission flag</param>
-        override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
+        override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
         {
             int dtvalue = Util.UnixTimeSinceEpoch();
 
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.UUID.ToString();
-            param["@friendID"] = friend.UUID.ToString();
+            param["@ownerID"] = friendlistowner.ToString();
+            param["@friendID"] = friend.ToString();
             param["@friendPerms"] = perms.ToString();
             param["@datetimestamp"] = dtvalue.ToString();
 
@@ -229,11 +229,11 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <param name="friend">UUID of the not-so-friendly user to remove from the list</param>
-        override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
+        override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.UUID.ToString();
-            param["@friendID"] = friend.UUID.ToString();
+            param["@ownerID"] = friendlistowner.ToString();
+            param["@friendID"] = friend.ToString();
 
 
             try
@@ -267,11 +267,11 @@ namespace OpenSim.Data.MSSQL
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <param name="friend">UUID of the friend</param>
         /// <param name="perms">new permission flag</param>
-        override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
+        override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.UUID.ToString();
-            param["@friendID"] = friend.UUID.ToString();
+            param["@ownerID"] = friendlistowner.ToString();
+            param["@friendID"] = friend.ToString();
             param["@friendPerms"] = perms.ToString();
 
 
@@ -298,12 +298,12 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <returns>Friendlist list</returns>
-        override public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
+        override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
         {
             List<FriendListItem> Lfli = new List<FriendListItem>();
 
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.UUID.ToString();
+            param["@ownerID"] = friendlistowner.ToString();
 
             try
             {
@@ -318,8 +318,8 @@ namespace OpenSim.Data.MSSQL
                     while (reader.Read())
                     {
                         FriendListItem fli = new FriendListItem();
-                        fli.FriendListOwner = new LLUUID((string)reader["ownerID"]);
-                        fli.Friend = new LLUUID((string)reader["friendID"]);
+                        fli.FriendListOwner = new UUID((string)reader["ownerID"]);
+                        fli.Friend = new UUID((string)reader["friendID"]);
                         fli.FriendPerms = (uint)Convert.ToInt32(reader["friendPerms"]);
 
                         // This is not a real column in the database table, it's a joined column from the opposite record
@@ -345,7 +345,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="avatarid">avatar uuid</param>
         /// <param name="regionuuid">region uuid</param>
         /// <param name="regionhandle">region handle</param>
-        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
+        override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
         {
             //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
         }
@@ -356,7 +356,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="queryID"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
         {
             List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
             string[] querysplit;
@@ -375,7 +375,7 @@ namespace OpenSim.Data.MSSQL
                         while (reader.Read())
                         {
                             AvatarPickerAvatar user = new AvatarPickerAvatar();
-                            user.AvatarID = new LLUUID((string)reader["UUID"]);
+                            user.AvatarID = new UUID((string)reader["UUID"]);
                             user.firstName = (string)reader["username"];
                             user.lastName = (string)reader["lastname"];
                             returnlist.Add(user);
@@ -400,7 +400,7 @@ namespace OpenSim.Data.MSSQL
                         while (reader.Read())
                         {
                             AvatarPickerAvatar user = new AvatarPickerAvatar();
-                            user.AvatarID = new LLUUID((string)reader["UUID"]);
+                            user.AvatarID = new UUID((string)reader["UUID"]);
                             user.firstName = (string)reader["username"];
                             user.lastName = (string)reader["lastname"];
                             returnlist.Add(user);
@@ -420,7 +420,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="uuid"></param>
         /// <returns></returns>
-        override public UserProfileData GetUserByUUID(LLUUID uuid)
+        override public UserProfileData GetUserByUUID(UUID uuid)
         {
             try
             {
@@ -467,7 +467,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="uuid">The accounts UUID</param>
         /// <returns>The users session</returns>
-        override public UserAgentData GetAgentByUUID(LLUUID uuid)
+        override public UserAgentData GetAgentByUUID(UUID uuid)
         {
             try
             {
@@ -493,7 +493,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="AgentID">The agent UUID</param>
         /// <param name="WebLoginKey">the WebLogin Key</param>
         /// <remarks>unused ?</remarks>
-        override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
+        override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
         {
             UserProfileData user = GetUserByUUID(AgentID);
             user.WebLoginKey = WebLoginKey;
@@ -549,12 +549,12 @@ namespace OpenSim.Data.MSSQL
         /// <param name="profileImage">UUID for profile image</param>
         /// <param name="firstImage">UUID for firstlife image</param>
         /// <returns>Success?</returns>
-        private bool InsertUserRow(LLUUID uuid, string username, string lastname, string passwordHash,
+        private bool InsertUserRow(UUID uuid, string username, string lastname, string passwordHash,
                                   string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,
                                   float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
                                   string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
                                   string aboutText, string firstText,
-                                  LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey)
+                                  UUID profileImage, UUID firstImage, UUID webLoginKey)
         {
             string sql = "INSERT INTO "+m_usersTableName;
             sql += " ([UUID], [username], [lastname], [passwordHash], [passwordSalt], [homeRegion], ";
@@ -594,7 +594,7 @@ namespace OpenSim.Data.MSSQL
             parameters["profileFirstText"] = firstText;
             parameters["profileImage"] = profileImage.ToString();
             parameters["profileFirstImage"] = firstImage.ToString();
-            parameters["webLoginKey"] = LLUUID.Random().ToString();
+            parameters["webLoginKey"] = UUID.Random().ToString();
 
 
             try
@@ -683,7 +683,7 @@ namespace OpenSim.Data.MSSQL
                 SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
                 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
                 SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString());
-                SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString());
+                SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.ToString());
                 command.Parameters.Add(param1);
                 command.Parameters.Add(param2);
                 command.Parameters.Add(param3);
@@ -728,7 +728,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="to">The receivers account ID</param>
         /// <param name="amount">The amount to transfer</param>
         /// <returns>false</returns>
-        override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount)
+        override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
         {
             return false;
         }
@@ -741,14 +741,14 @@ namespace OpenSim.Data.MSSQL
         /// <param name="to">The receivers account ID</param>
         /// <param name="item">The item to transfer</param>
         /// <returns>false</returns>
-        override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
+        override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
         {
             return false;
         }
 
         /// Appearance
         /// TODO: stubs for now to get us to a compiling state gently
-        override public AvatarAppearance GetUserAppearance(LLUUID user)
+        override public AvatarAppearance GetUserAppearance(UUID user)
         {
 //            return new AvatarAppearance();
             try
@@ -784,37 +784,37 @@ namespace OpenSim.Data.MSSQL
             {
                 AvatarAppearance appearance = new AvatarAppearance();
 
-                appearance.Owner = new LLUUID((string)reader["owner"]);
+                appearance.Owner = new UUID((string)reader["owner"]);
                 appearance.Serial = Convert.ToInt32(reader["serial"]);
                 appearance.VisualParams = (byte[])reader["visual_params"];
-                appearance.Texture = new LLObject.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
+                appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
                 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]);
-                appearance.BodyItem = new LLUUID((string)reader["body_item"]);
-                appearance.BodyAsset = new LLUUID((string)reader["body_asset"]);
-                appearance.SkinItem = new LLUUID((string)reader["skin_item"]);
-                appearance.SkinAsset = new LLUUID((string)reader["skin_asset"]);
-                appearance.HairItem = new LLUUID((string)reader["hair_item"]);
-                appearance.HairAsset = new LLUUID((string)reader["hair_asset"]);
-                appearance.EyesItem = new LLUUID((string)reader["eyes_item"]);
-                appearance.EyesAsset = new LLUUID((string)reader["eyes_asset"]);
-                appearance.ShirtItem = new LLUUID((string)reader["shirt_item"]);
-                appearance.ShirtAsset = new LLUUID((string)reader["shirt_asset"]);
-                appearance.PantsItem = new LLUUID((string)reader["pants_item"]);
-                appearance.PantsAsset = new LLUUID((string)reader["pants_asset"]);
-                appearance.ShoesItem = new LLUUID((string)reader["shoes_item"]);
-                appearance.ShoesAsset = new LLUUID((string)reader["shoes_asset"]);
-                appearance.SocksItem = new LLUUID((string)reader["socks_item"]);
-                appearance.SocksAsset = new LLUUID((string)reader["socks_asset"]);
-                appearance.JacketItem = new LLUUID((string)reader["jacket_item"]);
-                appearance.JacketAsset = new LLUUID((string)reader["jacket_asset"]);
-                appearance.GlovesItem = new LLUUID((string)reader["gloves_item"]);
-                appearance.GlovesAsset = new LLUUID((string)reader["gloves_asset"]);
-                appearance.UnderShirtItem = new LLUUID((string)reader["undershirt_item"]);
-                appearance.UnderShirtAsset = new LLUUID((string)reader["undershirt_asset"]);
-                appearance.UnderPantsItem = new LLUUID((string)reader["underpants_item"]);
-                appearance.UnderPantsAsset = new LLUUID((string)reader["underpants_asset"]);
-                appearance.SkirtItem = new LLUUID((string)reader["skirt_item"]);
-                appearance.SkirtAsset = new LLUUID((string)reader["skirt_asset"]);
+                appearance.BodyItem = new UUID((string)reader["body_item"]);
+                appearance.BodyAsset = new UUID((string)reader["body_asset"]);
+                appearance.SkinItem = new UUID((string)reader["skin_item"]);
+                appearance.SkinAsset = new UUID((string)reader["skin_asset"]);
+                appearance.HairItem = new UUID((string)reader["hair_item"]);
+                appearance.HairAsset = new UUID((string)reader["hair_asset"]);
+                appearance.EyesItem = new UUID((string)reader["eyes_item"]);
+                appearance.EyesAsset = new UUID((string)reader["eyes_asset"]);
+                appearance.ShirtItem = new UUID((string)reader["shirt_item"]);
+                appearance.ShirtAsset = new UUID((string)reader["shirt_asset"]);
+                appearance.PantsItem = new UUID((string)reader["pants_item"]);
+                appearance.PantsAsset = new UUID((string)reader["pants_asset"]);
+                appearance.ShoesItem = new UUID((string)reader["shoes_item"]);
+                appearance.ShoesAsset = new UUID((string)reader["shoes_asset"]);
+                appearance.SocksItem = new UUID((string)reader["socks_item"]);
+                appearance.SocksAsset = new UUID((string)reader["socks_asset"]);
+                appearance.JacketItem = new UUID((string)reader["jacket_item"]);
+                appearance.JacketAsset = new UUID((string)reader["jacket_asset"]);
+                appearance.GlovesItem = new UUID((string)reader["gloves_item"]);
+                appearance.GlovesAsset = new UUID((string)reader["gloves_asset"]);
+                appearance.UnderShirtItem = new UUID((string)reader["undershirt_item"]);
+                appearance.UnderShirtAsset = new UUID((string)reader["undershirt_asset"]);
+                appearance.UnderPantsItem = new UUID((string)reader["underpants_item"]);
+                appearance.UnderPantsAsset = new UUID((string)reader["underpants_asset"]);
+                appearance.SkirtItem = new UUID((string)reader["skirt_item"]);
+                appearance.SkirtAsset = new UUID((string)reader["skirt_asset"]);
 
                 return appearance;
             }
@@ -831,7 +831,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="user">the used UUID</param>
         /// <param name="appearance">the appearence</param>
-        override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
+        override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
         {
             string sql = String.Empty;
             sql += "DELETE FROM avatarappearance WHERE owner=@owner ";
@@ -918,7 +918,7 @@ namespace OpenSim.Data.MSSQL
         {
         }
 
-        override public void ResetAttachments(LLUUID userID)
+        override public void ResetAttachments(UUID userID)
         {
         }
     }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 08a8c6e..5c58a4b 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
@@ -116,7 +116,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="assetID">Asset UUID to fetch</param>
         /// <returns>Return the asset</returns>
         /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
-        override public AssetBase FetchAsset(LLUUID assetID)
+        override public AssetBase FetchAsset(UUID assetID)
         {
             AssetBase asset = null;
             lock (_dbConnection)
@@ -223,7 +223,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="uuid">The asset UUID</param>
         /// <returns>true if exist.</returns>
-        override public bool ExistsAsset(LLUUID uuid)
+        override public bool ExistsAsset(UUID uuid)
         {
             bool assetExists = false;
 
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 2ab7d40..8eddec6 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.IO;
 using System.Reflection;
 using System.Threading;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
@@ -157,7 +157,7 @@ namespace OpenSim.Data.MySQL
             m_lastConnectionUse = timeNow;
         }
 
-        public EstateSettings LoadEstateSettings(LLUUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID)
         {
             EstateSettings es = new EstateSettings();
             es.OnSave += StoreEstateSettings;
@@ -185,11 +185,11 @@ namespace OpenSim.Data.MySQL
                         else
                             m_FieldMap[name].SetValue(es, false);
                     }
-                    else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
+                    else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
                     {
-                        LLUUID uuid = LLUUID.Zero;
+                        UUID uuid = UUID.Zero;
 
-                        LLUUID.TryParse(r[name].ToString(), out uuid);
+                        UUID.TryParse(r[name].ToString(), out uuid);
                         m_FieldMap[name].SetValue(es, uuid);
                     }
                     else
@@ -330,8 +330,8 @@ namespace OpenSim.Data.MySQL
             {
                 EstateBan eb = new EstateBan();
 
-                LLUUID uuid = new LLUUID();
-                LLUUID.TryParse(r["bannedUUID"].ToString(), out uuid);
+                UUID uuid = new UUID();
+                UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
 
                 eb.bannedUUID = uuid;
                 eb.bannedIP = "0.0.0.0";
@@ -366,7 +366,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        void SaveUUIDList(uint EstateID, string table, LLUUID[] data)
+        void SaveUUIDList(uint EstateID, string table, UUID[] data)
         {
             CheckConnection();
 
@@ -381,7 +381,7 @@ namespace OpenSim.Data.MySQL
 
             cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )";
 
-            foreach (LLUUID uuid in data)
+            foreach (UUID uuid in data)
             {
                 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
                 cmd.Parameters.AddWithValue("?uuid", uuid.ToString());
@@ -391,9 +391,9 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        LLUUID[] LoadUUIDList(uint EstateID, string table)
+        UUID[] LoadUUIDList(uint EstateID, string table)
         {
-            List<LLUUID> uuids = new List<LLUUID>();
+            List<UUID> uuids = new List<UUID>();
 
             CheckConnection();
 
@@ -408,8 +408,8 @@ namespace OpenSim.Data.MySQL
             {
                 // EstateBan eb = new EstateBan();
 
-                LLUUID uuid = new LLUUID();
-                LLUUID.TryParse(r["uuid"].ToString(), out uuid);
+                UUID uuid = new UUID();
+                UUID.TryParse(r["uuid"].ToString(), out uuid);
 
                 uuids.Add(uuid);
             }
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 9dc3d18..fa5b33c 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL
             }
             else
             {
-                m_log.Warn("Using deprecated mysql_connection.ini.  Please update database_connect in GridServer_Config.xml and we'll use that instead");
+                m_log.Warn("Using deprecated mysql_connection.ini.  Please update database_connect in GridServer_Config.Xml and we'll use that instead");
                 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
                 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
                 string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
@@ -322,7 +322,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="uuid">The region UUID</param>
         /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
+        override public RegionProfileData GetProfileByUUID(UUID uuid)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
@@ -458,14 +458,14 @@ namespace OpenSim.Data.MySQL
         /// <param name="handle">The attempted regionHandle of the challenger</param>
         /// <param name="authkey">The secret</param>
         /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
+        override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
         {
             bool throwHissyFit = false; // Should be true by 1.0
 
             if (throwHissyFit)
                 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
 
-            RegionProfileData data = GetProfileByLLUUID(uuid);
+            RegionProfileData data = GetProfileByUUID(uuid);
 
             return (handle == data.regionHandle && authkey == data.regionSecret);
         }
@@ -479,7 +479,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="authhash"></param>
         /// <param name="challenge"></param>
         /// <returns></returns>
-        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
+        public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
         {
             // SHA512Managed HashProvider = new SHA512Managed();
             // Encoding TextProvider = new UTF8Encoding();
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index fe2d393..50d3cc7 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
@@ -125,7 +125,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="folderID">The folder to search</param>
         /// <returns>A list containing inventory items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
             try
             {
@@ -163,7 +163,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="user">The user whos inventory is to be searched</param>
         /// <returns>A list of folder objects</returns>
-        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
+        public List<InventoryFolderBase> getUserRootFolders(UUID user)
         {
             try
             {
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MySQL
                             "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
                             database.Connection);
                     result.Parameters.AddWithValue("?uuid", user.ToString());
-                    result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString());
+                    result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
                     MySqlDataReader reader = result.ExecuteReader();
 
                     List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="user">The user UUID</param>
         /// <returns></returns>
-        public InventoryFolderBase getUserRootFolder(LLUUID user)
+        public InventoryFolderBase getUserRootFolder(UUID user)
         {
             try
             {
@@ -217,7 +217,7 @@ namespace OpenSim.Data.MySQL
                             "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
                             database.Connection);
                     result.Parameters.AddWithValue("?uuid", user.ToString());
-                    result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString());
+                    result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
 
                     MySqlDataReader reader = result.ExecuteReader();
 
@@ -258,7 +258,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="parentID">The folder to search</param>
         /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
             try
             {
@@ -302,23 +302,23 @@ namespace OpenSim.Data.MySQL
             {
                 InventoryItemBase item = new InventoryItemBase();
 
-                item.ID = new LLUUID((string) reader["inventoryID"]);
-                item.AssetID = new LLUUID((string) reader["assetID"]);
+                item.ID = new UUID((string) reader["inventoryID"]);
+                item.AssetID = new UUID((string) reader["assetID"]);
                 item.AssetType = (int) reader["assetType"];
-                item.Folder = new LLUUID((string) reader["parentFolderID"]);
-                item.Owner = new LLUUID((string) reader["avatarID"]);
+                item.Folder = new UUID((string) reader["parentFolderID"]);
+                item.Owner = new UUID((string) reader["avatarID"]);
                 item.Name = (string) reader["inventoryName"];
                 item.Description = (string) reader["inventoryDescription"];
                 item.NextPermissions = (uint) reader["inventoryNextPermissions"];
                 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"];
                 item.InvType = (int) reader["invType"];
-                item.Creator = new LLUUID((string) reader["creatorID"]);
+                item.Creator = new UUID((string) reader["creatorID"]);
                 item.BasePermissions = (uint) reader["inventoryBasePermissions"];
                 item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"];
                 item.SalePrice = (int) reader["salePrice"];
                 item.SaleType = Convert.ToByte(reader["saleType"]);
                 item.CreationDate = (int) reader["creationDate"];
-                item.GroupID = new LLUUID(reader["groupID"].ToString());
+                item.GroupID = new UUID(reader["groupID"].ToString());
                 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
                 item.Flags = (uint) reader["flags"];
 
@@ -337,7 +337,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="item">The item to return</param>
         /// <returns>An inventory item</returns>
-        public InventoryItemBase getInventoryItem(LLUUID itemID)
+        public InventoryItemBase getInventoryItem(UUID itemID)
         {
             try
             {
@@ -378,9 +378,9 @@ namespace OpenSim.Data.MySQL
             try
             {
                 InventoryFolderBase folder = new InventoryFolderBase();
-                folder.Owner = new LLUUID((string) reader["agentID"]);
-                folder.ParentID = new LLUUID((string) reader["parentFolderID"]);
-                folder.ID = new LLUUID((string) reader["folderID"]);
+                folder.Owner = new UUID((string) reader["agentID"]);
+                folder.ParentID = new UUID((string) reader["parentFolderID"]);
+                folder.ID = new UUID((string) reader["folderID"]);
                 folder.Name = (string) reader["folderName"];
                 folder.Type = (short) reader["type"];
                 folder.Version = (ushort) ((int) reader["version"]);
@@ -400,7 +400,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="folder">The folder to return</param>
         /// <returns>A folder class</returns>
-        public InventoryFolderBase getInventoryFolder(LLUUID folderID)
+        public InventoryFolderBase getInventoryFolder(UUID folderID)
         {
             try
             {
@@ -498,7 +498,7 @@ namespace OpenSim.Data.MySQL
         /// Detele the specified inventory item
         /// </summary>
         /// <param name="item">The inventory item UUID to delete</param>
-        public void deleteInventoryItem(LLUUID itemID)
+        public void deleteInventoryItem(UUID itemID)
         {
             try
             {
@@ -596,7 +596,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="folders">list where folders will be appended</param>
         /// <param name="parentID">ID of parent</param>
-        protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID)
+        protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
         {
             List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID);
 
@@ -610,7 +610,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="parentID"></param>
         /// <returns></returns>
-        public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID)
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
         {
             /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
                  * - We will only need to hit the database twice instead of n times.
@@ -631,8 +631,8 @@ namespace OpenSim.Data.MySQL
             try
             {
                 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-                Dictionary<LLUUID, List<InventoryFolderBase>> hashtable
-                    = new Dictionary<LLUUID, List<InventoryFolderBase>>(); ;
+                Dictionary<UUID, List<InventoryFolderBase>> hashtable
+                    = new Dictionary<UUID, List<InventoryFolderBase>>(); ;
                 List<InventoryFolderBase> parentFolder = new List<InventoryFolderBase>();
                 lock (database)
                 {
@@ -655,7 +655,7 @@ namespace OpenSim.Data.MySQL
 
                     if (parentFolder.Count >= 1)   // No result means parent folder does not exist
                     {
-                        if (parentFolder[0].ParentID == LLUUID.Zero) // We are querying the root folder
+                        if (parentFolder[0].ParentID == UUID.Zero) // We are querying the root folder
                         {
                             /* Get all of the agent's folders from the database, put them in a list and return it */
                             result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid",
@@ -728,7 +728,7 @@ namespace OpenSim.Data.MySQL
         /// Delete a folder from database
         /// </summary>
         /// <param name="folderID">the folder UUID</param>
-        protected void deleteOneFolder(LLUUID folderID)
+        protected void deleteOneFolder(UUID folderID)
         {
             try
             {
@@ -754,7 +754,7 @@ namespace OpenSim.Data.MySQL
         /// Delete all item in a folder
         /// </summary>
         /// <param name="folderID">the folder UUID</param>
-        protected void deleteItemsInFolder(LLUUID folderID)
+        protected void deleteItemsInFolder(UUID folderID)
         {
             try
             {
@@ -780,7 +780,7 @@ namespace OpenSim.Data.MySQL
         /// Deletes an inventory folder
         /// </summary>
         /// <param name="folderId">Id of folder to delete</param>
-        public void deleteInventoryFolder(LLUUID folderID)
+        public void deleteInventoryFolder(UUID folderID)
         {
             List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID);
 
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index c02016c..07ef916 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Data.MySQL
             }
             else
             {
-                m_log.Warn("Using deprecated mysql_connection.ini.  Please update database_connect in GridServer_Config.xml and we'll use that instead");
+                m_log.Warn("Using deprecated mysql_connection.ini.  Please update database_connect in GridServer_Config.Xml and we'll use that instead");
 
                 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
                 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index e863216..6048f93 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -31,7 +31,7 @@ using System.Collections;
 using System.Data;
 using System.IO;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
@@ -384,8 +384,8 @@ namespace OpenSim.Data.MySQL
                 {
                     retval.regionHandle = tmp64;
                 }
-                LLUUID tmp_uuid;
-                if (!LLUUID.TryParse((string)reader["uuid"], out tmp_uuid))
+                UUID tmp_uuid;
+                if (!UUID.TryParse((string)reader["uuid"], out tmp_uuid))
                 {
                     return null;
                 }
@@ -396,7 +396,7 @@ namespace OpenSim.Data.MySQL
 
                 // non-critical parts
                 retval.regionName = (string)reader["regionName"];
-                retval.originUUID = new LLUUID((string) reader["originUUID"]);
+                retval.originUUID = new UUID((string) reader["originUUID"]);
 
                 // Secrets
                 retval.regionRecvKey = (string) reader["regionRecvKey"];
@@ -434,8 +434,8 @@ namespace OpenSim.Data.MySQL
                 retval.regionUserSendKey = (string) reader["regionUserSendKey"];
 
                 // World Map Addition
-                LLUUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
-                LLUUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
+                UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
+                UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
             }
             else
             {
@@ -463,8 +463,8 @@ namespace OpenSim.Data.MySQL
                 retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
                 retval.reservationName = (string) reader["resName"];
                 retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
-                LLUUID tmp;
-                LLUUID.TryParse((string) reader["userUUID"], out tmp);
+                UUID tmp;
+                UUID.TryParse((string) reader["userUUID"], out tmp);
                 retval.userUUID = tmp;
             }
             else
@@ -486,15 +486,15 @@ namespace OpenSim.Data.MySQL
             if (reader.Read())
             {
                 // Agent IDs
-                LLUUID tmp;
-                if (!LLUUID.TryParse((string)reader["UUID"], out tmp))
+                UUID tmp;
+                if (!UUID.TryParse((string)reader["UUID"], out tmp))
                     return null;
                 retval.ProfileID = tmp;
 
-                LLUUID.TryParse((string) reader["sessionID"], out tmp);
+                UUID.TryParse((string) reader["sessionID"], out tmp);
                 retval.SessionID = tmp;
 
-                LLUUID.TryParse((string)reader["secureSessionID"], out tmp);
+                UUID.TryParse((string)reader["secureSessionID"], out tmp);
                 retval.SecureSessionID = tmp;
 
                 // Agent Who?
@@ -507,10 +507,10 @@ namespace OpenSim.Data.MySQL
                 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
 
                 // Current position
-                retval.Region = new LLUUID((string)reader["currentRegion"]);
+                retval.Region = new UUID((string)reader["currentRegion"]);
                 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
-                LLVector3 tmp_v;
-                LLVector3.TryParse((string) reader["currentPos"], out tmp_v);
+                Vector3 tmp_v;
+                Vector3.TryParse((string) reader["currentPos"], out tmp_v);
                 retval.Position = tmp_v;
             }
             else
@@ -531,8 +531,8 @@ namespace OpenSim.Data.MySQL
 
             if (reader.Read())
             {
-                LLUUID id;
-                if (!LLUUID.TryParse((string)reader["UUID"], out id))
+                UUID id;
+                if (!UUID.TryParse((string)reader["UUID"], out id))
                     return null;
 
                 retval.ID = id;
@@ -543,17 +543,17 @@ namespace OpenSim.Data.MySQL
                 retval.PasswordSalt = (string) reader["passwordSalt"];
 
                 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
-                retval.HomeLocation = new LLVector3(
+                retval.HomeLocation = new Vector3(
                     Convert.ToSingle(reader["homeLocationX"].ToString()),
                     Convert.ToSingle(reader["homeLocationY"].ToString()),
                     Convert.ToSingle(reader["homeLocationZ"].ToString()));
-                retval.HomeLookAt = new LLVector3(
+                retval.HomeLookAt = new Vector3(
                     Convert.ToSingle(reader["homeLookAtX"].ToString()),
                     Convert.ToSingle(reader["homeLookAtY"].ToString()),
                     Convert.ToSingle(reader["homeLookAtZ"].ToString()));
 
-                LLUUID regionID = LLUUID.Zero;
-                LLUUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero
+                UUID regionID = UUID.Zero;
+                UUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
                 retval.HomeRegionID = regionID;
 
                 retval.Created = Convert.ToInt32(reader["created"].ToString());
@@ -576,29 +576,29 @@ namespace OpenSim.Data.MySQL
                     retval.FirstLifeAboutText = (string)reader["profileFirstText"];
 
                 if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
-                    retval.Image = LLUUID.Zero;
+                    retval.Image = UUID.Zero;
                 else {
-                    LLUUID tmp;
-                    LLUUID.TryParse((string)reader["profileImage"], out tmp);
+                    UUID tmp;
+                    UUID.TryParse((string)reader["profileImage"], out tmp);
                     retval.Image = tmp;
                 }
 
                 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
-                    retval.FirstLifeImage = LLUUID.Zero;
+                    retval.FirstLifeImage = UUID.Zero;
                 else {
-                    LLUUID tmp;
-                    LLUUID.TryParse((string)reader["profileFirstImage"], out tmp);
+                    UUID tmp;
+                    UUID.TryParse((string)reader["profileFirstImage"], out tmp);
                     retval.FirstLifeImage = tmp;
                 }
 
                 if (reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
                 {
-                    retval.WebLoginKey = LLUUID.Zero;
+                    retval.WebLoginKey = UUID.Zero;
                 }
                 else
                 {
-                    LLUUID tmp;
-                    LLUUID.TryParse((string)reader["webLoginKey"], out tmp);
+                    UUID tmp;
+                    UUID.TryParse((string)reader["webLoginKey"], out tmp);
                     retval.WebLoginKey = tmp;
                 }
 
@@ -611,12 +611,12 @@ namespace OpenSim.Data.MySQL
 
                 if (reader.IsDBNull(reader.GetOrdinal("partner")))
                 {
-                    retval.Partner = LLUUID.Zero;
+                    retval.Partner = UUID.Zero;
                 }
                 else
                 {
-                    LLUUID tmp;
-                    LLUUID.TryParse((string)reader["partner"], out tmp);
+                    UUID tmp;
+                    UUID.TryParse((string)reader["partner"], out tmp);
                     retval.Partner = tmp;
                 }
             }
@@ -638,37 +638,37 @@ namespace OpenSim.Data.MySQL
             if (reader.Read())
             {
                 appearance = new AvatarAppearance();
-                appearance.Owner = new LLUUID((string)reader["owner"]);
+                appearance.Owner = new UUID((string)reader["owner"]);
                 appearance.Serial = Convert.ToInt32(reader["serial"]);
                 appearance.VisualParams = (byte[])reader["visual_params"];
-                appearance.Texture = new LLObject.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
+                appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
                 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]);
-                appearance.BodyItem = new LLUUID((string)reader["body_item"]);
-                appearance.BodyAsset = new LLUUID((string)reader["body_asset"]);
-                appearance.SkinItem = new LLUUID((string)reader["skin_item"]);
-                appearance.SkinAsset = new LLUUID((string)reader["skin_asset"]);
-                appearance.HairItem = new LLUUID((string)reader["hair_item"]);
-                appearance.HairAsset = new LLUUID((string)reader["hair_asset"]);
-                appearance.EyesItem = new LLUUID((string)reader["eyes_item"]);
-                appearance.EyesAsset = new LLUUID((string)reader["eyes_asset"]);
-                appearance.ShirtItem = new LLUUID((string)reader["shirt_item"]);
-                appearance.ShirtAsset = new LLUUID((string)reader["shirt_asset"]);
-                appearance.PantsItem = new LLUUID((string)reader["pants_item"]);
-                appearance.PantsAsset = new LLUUID((string)reader["pants_asset"]);
-                appearance.ShoesItem = new LLUUID((string)reader["shoes_item"]);
-                appearance.ShoesAsset = new LLUUID((string)reader["shoes_asset"]);
-                appearance.SocksItem = new LLUUID((string)reader["socks_item"]);
-                appearance.SocksAsset = new LLUUID((string)reader["socks_asset"]);
-                appearance.JacketItem = new LLUUID((string)reader["jacket_item"]);
-                appearance.JacketAsset = new LLUUID((string)reader["jacket_asset"]);
-                appearance.GlovesItem = new LLUUID((string)reader["gloves_item"]);
-                appearance.GlovesAsset = new LLUUID((string)reader["gloves_asset"]);
-                appearance.UnderShirtItem = new LLUUID((string)reader["undershirt_item"]);
-                appearance.UnderShirtAsset = new LLUUID((string)reader["undershirt_asset"]);
-                appearance.UnderPantsItem = new LLUUID((string)reader["underpants_item"]);
-                appearance.UnderPantsAsset = new LLUUID((string)reader["underpants_asset"]);
-                appearance.SkirtItem = new LLUUID((string)reader["skirt_item"]);
-                appearance.SkirtAsset = new LLUUID((string)reader["skirt_asset"]);
+                appearance.BodyItem = new UUID((string)reader["body_item"]);
+                appearance.BodyAsset = new UUID((string)reader["body_asset"]);
+                appearance.SkinItem = new UUID((string)reader["skin_item"]);
+                appearance.SkinAsset = new UUID((string)reader["skin_asset"]);
+                appearance.HairItem = new UUID((string)reader["hair_item"]);
+                appearance.HairAsset = new UUID((string)reader["hair_asset"]);
+                appearance.EyesItem = new UUID((string)reader["eyes_item"]);
+                appearance.EyesAsset = new UUID((string)reader["eyes_asset"]);
+                appearance.ShirtItem = new UUID((string)reader["shirt_item"]);
+                appearance.ShirtAsset = new UUID((string)reader["shirt_asset"]);
+                appearance.PantsItem = new UUID((string)reader["pants_item"]);
+                appearance.PantsAsset = new UUID((string)reader["pants_asset"]);
+                appearance.ShoesItem = new UUID((string)reader["shoes_item"]);
+                appearance.ShoesAsset = new UUID((string)reader["shoes_asset"]);
+                appearance.SocksItem = new UUID((string)reader["socks_item"]);
+                appearance.SocksAsset = new UUID((string)reader["socks_asset"]);
+                appearance.JacketItem = new UUID((string)reader["jacket_item"]);
+                appearance.JacketAsset = new UUID((string)reader["jacket_asset"]);
+                appearance.GlovesItem = new UUID((string)reader["gloves_item"]);
+                appearance.GlovesAsset = new UUID((string)reader["gloves_asset"]);
+                appearance.UnderShirtItem = new UUID((string)reader["undershirt_item"]);
+                appearance.UnderShirtAsset = new UUID((string)reader["undershirt_asset"]);
+                appearance.UnderPantsItem = new UUID((string)reader["underpants_item"]);
+                appearance.UnderPantsAsset = new UUID((string)reader["underpants_asset"]);
+                appearance.SkirtItem = new UUID((string)reader["skirt_item"]);
+                appearance.SkirtAsset = new UUID((string)reader["skirt_asset"]);
             }
             return appearance;
         }
@@ -766,12 +766,12 @@ namespace OpenSim.Data.MySQL
         /// <param name="firstImage">UUID for firstlife image</param>
         /// <param name="webLoginKey">Ignored</param>
         /// <returns>Success?</returns>
-        public bool insertUserRow(LLUUID uuid, string username, string lastname, string passwordHash,
+        public bool insertUserRow(UUID uuid, string username, string lastname, string passwordHash,
                                   string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,
                                   float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
                                   string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
                                   string aboutText, string firstText,
-                                  LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey)
+                                  UUID profileImage, UUID firstImage, UUID webLoginKey)
         {
             m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString());
             string sql =
@@ -867,12 +867,12 @@ namespace OpenSim.Data.MySQL
         /// <param name="firstImage">UUID for firstlife image</param>
         /// <param name="webLoginKey">UUID for weblogin Key</param>
         /// <returns>Success?</returns>
-        public bool updateUserRow(LLUUID uuid, string username, string lastname, string passwordHash,
-                                  string passwordSalt, UInt64 homeRegion, LLUUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ,
+        public bool updateUserRow(UUID uuid, string username, string lastname, string passwordHash,
+                                  string passwordSalt, UInt64 homeRegion, UUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ,
                                   float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
                                   string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
                                   string aboutText, string firstText,
-                                  LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey, int userFlags, int godLevel, string customType, LLUUID partner)
+                                  UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner)
         {
             string sql = "UPDATE users SET `username` = ?username , `lastname` = ?lastname ";
             sql += ", `passwordHash` = ?passwordHash , `passwordSalt` = ?passwordSalt , ";
@@ -1211,7 +1211,7 @@ namespace OpenSim.Data.MySQL
 
         }
 
-        public void writeAttachments(LLUUID agentID, Hashtable data)
+        public void writeAttachments(UUID agentID, Hashtable data)
         {
             string sql = "delete from avatarattachments where UUID = ?uuid";
 
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 903f022..9552ba1 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.IO;
 using System.Reflection;
 using System.Threading;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
@@ -296,15 +296,15 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="obj">The object</param>
         /// <param name="regionUUID">The region UUID</param>
-        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             lock (m_dataSet)
             {
                 foreach (SceneObjectPart prim in obj.Children.Values)
                 {
-                    if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0
-                        && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0
-                        && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0)
+                    if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
+                        && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
+                        && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
                     {
                         //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
                         addPrim(prim, obj.UUID, regionUUID);
@@ -323,9 +323,9 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="obj">The object</param>
         /// <param name="regionUUID">The Region UUID</param>
-        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
+        public void RemoveObject(UUID obj, UUID regionUUID)
         {
-            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
+            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj, regionUUID);
 
             DataTable prims = m_primTable;
             DataTable shapes = m_shapeTable;
@@ -337,7 +337,7 @@ namespace OpenSim.Data.MySQL
                 foreach (DataRow row in primRows)
                 {
                     // Remove shapes row
-                    LLUUID uuid = new LLUUID((string) row["UUID"]);
+                    UUID uuid = new UUID((string) row["UUID"]);
                     DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid));
                     if (shapeRow != null)
                     {
@@ -358,7 +358,7 @@ namespace OpenSim.Data.MySQL
         /// The caller must acquire the necessrary synchronization locks and commit or rollback changes.
         /// </summary>
         /// <param name="uuid">the Item UUID</param>
-        private void RemoveItems(LLUUID uuid)
+        private void RemoveItems(UUID uuid)
         {
             String sql = String.Format("primID = '{0}'", uuid);
             DataRow[] itemRows = m_itemsTable.Select(sql);
@@ -374,9 +374,9 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="regionUUID">the Region UUID</param>
         /// <returns>List of loaded groups</returns>
-        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
-            Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>();
+            Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
 
             List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
 
@@ -436,7 +436,7 @@ namespace OpenSim.Data.MySQL
                                     "No shape found for prim in storage, so setting default box shape");
                                 prim.Shape = PrimitiveBaseShape.Default;
                             }
-                            createdObjects[new LLUUID(objID)].AddPart(prim);
+                            createdObjects[new UUID(objID)].AddPart(prim);
                         }
 
                             LoadItems(prim);
@@ -497,7 +497,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="ter">HeightField data</param>
         /// <param name="regionID">region UUID</param>
-        public void StoreTerrain(double[,] ter, LLUUID regionID)
+        public void StoreTerrain(double[,] ter, UUID regionID)
         {
             int revision = 1;
             m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
@@ -527,7 +527,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="regionID">the region UUID</param>
         /// <returns>Heightfield data</returns>
-        public double[,] LoadTerrain(LLUUID regionID)
+        public double[,] LoadTerrain(UUID regionID)
         {
             double[,] terret = new double[256,256];
             terret.Initialize();
@@ -583,7 +583,7 @@ namespace OpenSim.Data.MySQL
         /// </list>
         /// </summary>
         /// <param name="globalID"></param>
-        public void RemoveLandObject(LLUUID globalID)
+        public void RemoveLandObject(UUID globalID)
         {
             lock (m_dataSet)
             {
@@ -646,7 +646,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public RegionSettings LoadRegionSettings(LLUUID regionUUID)
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             lock (m_dataSet)
             {
@@ -701,7 +701,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="regionUUID"></param>
         /// <returns></returns>
-        public List<LandData> LoadLandObjects(LLUUID regionUUID)
+        public List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landDataForRegion = new List<LandData>();
             lock (m_dataSet)
@@ -1101,7 +1101,7 @@ namespace OpenSim.Data.MySQL
         private SceneObjectPart buildPrim(DataRow row)
         {
             SceneObjectPart prim = new SceneObjectPart();
-            prim.UUID = new LLUUID((String) row["UUID"]);
+            prim.UUID = new UUID((String) row["UUID"]);
             // explicit conversion of integers is required, which sort
             // of sucks.  No idea if there is a shortcut here or not.
             prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -1114,54 +1114,54 @@ namespace OpenSim.Data.MySQL
             prim.TouchName = (String) row["TouchName"];
             // permissions
             prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
-            prim.CreatorID = new LLUUID((String) row["CreatorID"]);
-            prim.OwnerID = new LLUUID((String) row["OwnerID"]);
-            prim.GroupID = new LLUUID((String) row["GroupID"]);
-            prim.LastOwnerID = new LLUUID((String) row["LastOwnerID"]);
+            prim.CreatorID = new UUID((String) row["CreatorID"]);
+            prim.OwnerID = new UUID((String) row["OwnerID"]);
+            prim.GroupID = new UUID((String) row["GroupID"]);
+            prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
             prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
             prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
             prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
             prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
             prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
             // vectors
-            prim.OffsetPosition = new LLVector3(
+            prim.OffsetPosition = new Vector3(
                 Convert.ToSingle(row["PositionX"]),
                 Convert.ToSingle(row["PositionY"]),
                 Convert.ToSingle(row["PositionZ"])
                 );
-            prim.GroupPosition = new LLVector3(
+            prim.GroupPosition = new Vector3(
                 Convert.ToSingle(row["GroupPositionX"]),
                 Convert.ToSingle(row["GroupPositionY"]),
                 Convert.ToSingle(row["GroupPositionZ"])
                 );
-            prim.Velocity = new LLVector3(
+            prim.Velocity = new Vector3(
                 Convert.ToSingle(row["VelocityX"]),
                 Convert.ToSingle(row["VelocityY"]),
                 Convert.ToSingle(row["VelocityZ"])
                 );
-            prim.AngularVelocity = new LLVector3(
+            prim.AngularVelocity = new Vector3(
                 Convert.ToSingle(row["AngularVelocityX"]),
                 Convert.ToSingle(row["AngularVelocityY"]),
                 Convert.ToSingle(row["AngularVelocityZ"])
                 );
-            prim.Acceleration = new LLVector3(
+            prim.Acceleration = new Vector3(
                 Convert.ToSingle(row["AccelerationX"]),
                 Convert.ToSingle(row["AccelerationY"]),
                 Convert.ToSingle(row["AccelerationZ"])
                 );
             // quaternions
-            prim.RotationOffset = new LLQuaternion(
+            prim.RotationOffset = new Quaternion(
                 Convert.ToSingle(row["RotationX"]),
                 Convert.ToSingle(row["RotationY"]),
                 Convert.ToSingle(row["RotationZ"]),
                 Convert.ToSingle(row["RotationW"])
                 );
-            prim.SitTargetPositionLL = new LLVector3(
+            prim.SitTargetPositionLL = new Vector3(
                 Convert.ToSingle(row["SitTargetOffsetX"]),
                 Convert.ToSingle(row["SitTargetOffsetY"]),
                 Convert.ToSingle(row["SitTargetOffsetZ"])
                 );
-            prim.SitTargetOrientationLL = new LLQuaternion(
+            prim.SitTargetOrientationLL = new Quaternion(
                 Convert.ToSingle(row["SitTargetOrientX"]),
                 Convert.ToSingle(row["SitTargetOrientY"]),
                 Convert.ToSingle(row["SitTargetOrientZ"]),
@@ -1174,14 +1174,14 @@ namespace OpenSim.Data.MySQL
             prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]);
             prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]);
 
-            prim.Sound = new LLUUID(row["LoopedSound"].ToString());
+            prim.Sound = new UUID(row["LoopedSound"].ToString());
             prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
             prim.SoundFlags = 1; // If it's persisted at all, it's looped
 
             if (!row.IsNull("TextureAnimation"))
                 prim.TextureAnimation = (Byte[])row["TextureAnimation"];
 
-            prim.RotationalVelocity = new LLVector3(
+            prim.RotationalVelocity = new Vector3(
                 Convert.ToSingle(row["OmegaX"]),
                 Convert.ToSingle(row["OmegaY"]),
                 Convert.ToSingle(row["OmegaZ"])
@@ -1190,13 +1190,13 @@ namespace OpenSim.Data.MySQL
             // TODO: Rotation
             // OmegaX, OmegaY, OmegaZ
 
-            prim.SetCameraEyeOffset(new LLVector3(
+            prim.SetCameraEyeOffset(new Vector3(
                 Convert.ToSingle(row["CameraEyeOffsetX"]),
                 Convert.ToSingle(row["CameraEyeOffsetY"]),
                 Convert.ToSingle(row["CameraEyeOffsetZ"])
                 ));
 
-            prim.SetCameraAtOffset(new LLVector3(
+            prim.SetCameraAtOffset(new Vector3(
                 Convert.ToSingle(row["CameraAtOffsetX"]),
                 Convert.ToSingle(row["CameraAtOffsetY"]),
                 Convert.ToSingle(row["CameraAtOffsetZ"])
@@ -1229,10 +1229,10 @@ namespace OpenSim.Data.MySQL
         {
             TaskInventoryItem taskItem = new TaskInventoryItem();
 
-            taskItem.ItemID        = new LLUUID((String)row["itemID"]);
-            taskItem.ParentPartID  = new LLUUID((String)row["primID"]);
-            taskItem.AssetID       = new LLUUID((String)row["assetID"]);
-            taskItem.ParentID      = new LLUUID((String)row["parentFolderID"]);
+            taskItem.ItemID        = new UUID((String)row["itemID"]);
+            taskItem.ParentPartID  = new UUID((String)row["primID"]);
+            taskItem.AssetID       = new UUID((String)row["assetID"]);
+            taskItem.ParentID      = new UUID((String)row["parentFolderID"]);
 
             taskItem.InvType       = Convert.ToInt32(row["invType"]);
             taskItem.Type          = Convert.ToInt32(row["assetType"]);
@@ -1240,10 +1240,10 @@ namespace OpenSim.Data.MySQL
             taskItem.Name          = (String)row["name"];
             taskItem.Description   = (String)row["description"];
             taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
-            taskItem.CreatorID     = new LLUUID((String)row["creatorID"]);
-            taskItem.OwnerID       = new LLUUID((String)row["ownerID"]);
-            taskItem.LastOwnerID   = new LLUUID((String)row["lastOwnerID"]);
-            taskItem.GroupID       = new LLUUID((String)row["groupID"]);
+            taskItem.CreatorID     = new UUID((String)row["creatorID"]);
+            taskItem.OwnerID       = new UUID((String)row["ownerID"]);
+            taskItem.LastOwnerID   = new UUID((String)row["lastOwnerID"]);
+            taskItem.GroupID       = new UUID((String)row["groupID"]);
 
             taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
             taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
@@ -1259,7 +1259,7 @@ namespace OpenSim.Data.MySQL
         {
             RegionSettings newSettings = new RegionSettings();
 
-            newSettings.RegionUUID = new LLUUID((string) row["regionUUID"]);
+            newSettings.RegionUUID = new UUID((string) row["regionUUID"]);
             newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
             newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
             newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
@@ -1273,10 +1273,10 @@ namespace OpenSim.Data.MySQL
             newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
             newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
             newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
-            newSettings.TerrainTexture1 = new LLUUID((String) row["terrain_texture_1"]);
-            newSettings.TerrainTexture2 = new LLUUID((String) row["terrain_texture_2"]);
-            newSettings.TerrainTexture3 = new LLUUID((String) row["terrain_texture_3"]);
-            newSettings.TerrainTexture4 = new LLUUID((String) row["terrain_texture_4"]);
+            newSettings.TerrainTexture1 = new UUID((String) row["terrain_texture_1"]);
+            newSettings.TerrainTexture2 = new UUID((String) row["terrain_texture_2"]);
+            newSettings.TerrainTexture3 = new UUID((String) row["terrain_texture_3"]);
+            newSettings.TerrainTexture4 = new UUID((String) row["terrain_texture_4"]);
             newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
             newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
             newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
@@ -1292,7 +1292,7 @@ namespace OpenSim.Data.MySQL
             newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
-            newSettings.Covenant = new LLUUID((String) row["covenant"]);
+            newSettings.Covenant = new UUID((String) row["covenant"]);
 
             return newSettings;
         }
@@ -1306,7 +1306,7 @@ namespace OpenSim.Data.MySQL
         {
             LandData newData = new LandData();
 
-            newData.GlobalID = new LLUUID((String) row["UUID"]);
+            newData.GlobalID = new UUID((String) row["UUID"]);
             newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
 
             // Bitmap is a byte[512]
@@ -1322,39 +1322,39 @@ namespace OpenSim.Data.MySQL
                 //Enum libsecondlife.Parcel.ParcelCategory
             newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
             newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
-            newData.GroupID = new LLUUID((String) row["GroupUUID"]);
+            newData.GroupID = new UUID((String) row["GroupUUID"]);
             newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
             newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]);
                 //Enum. libsecondlife.Parcel.ParcelStatus
             newData.Flags = Convert.ToUInt32(row["LandFlags"]);
             newData.LandingType = Convert.ToByte(row["LandingType"]);
             newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]);
-            newData.MediaID = new LLUUID((String) row["MediaTextureUUID"]);
+            newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
             newData.MediaURL = (String) row["MediaURL"];
             newData.MusicURL = (String) row["MusicURL"];
             newData.PassHours = Convert.ToSingle(row["PassHours"]);
             newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
-            LLUUID authedbuyer = LLUUID.Zero;
-            LLUUID snapshotID = LLUUID.Zero;
+            UUID authedbuyer = UUID.Zero;
+            UUID snapshotID = UUID.Zero;
 
-            Helpers.TryParse((string)row["AuthBuyerID"], out authedbuyer);
-            Helpers.TryParse((string)row["SnapshotUUID"], out snapshotID);
+            UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer);
+            UUID.TryParse((string)row["SnapshotUUID"], out snapshotID);
 
             newData.AuthBuyerID = authedbuyer;
             newData.SnapshotID = snapshotID;
             try
             {
                 newData.UserLocation =
-                    new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
+                    new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
                                   Convert.ToSingle(row["UserLocationZ"]));
                 newData.UserLookAt =
-                    new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
+                    new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
                                   Convert.ToSingle(row["UserLookAtZ"]));
             }
             catch (InvalidCastException)
             {
-                newData.UserLocation = LLVector3.Zero;
-                newData.UserLookAt = LLVector3.Zero;
+                newData.UserLocation = Vector3.Zero;
+                newData.UserLookAt = Vector3.Zero;
                 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
             }
 
@@ -1371,7 +1371,7 @@ namespace OpenSim.Data.MySQL
         private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
         {
             ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-            entry.AgentID = new LLUUID((string) row["AccessUUID"]);
+            entry.AgentID = new UUID((string) row["AccessUUID"]);
             entry.Flags = (ParcelManager.AccessList) Convert.ToInt32(row["Flags"]);
             entry.Time = new DateTime();
             return entry;
@@ -1408,7 +1408,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="prim"></param>
         /// <param name="sceneGroupID"></param>
         /// <param name="regionUUID"></param>
-        private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
+        private void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
         {
             row["UUID"] = Util.ToRawUuidString(prim.UUID);
             row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1456,12 +1456,12 @@ namespace OpenSim.Data.MySQL
             row["RotationW"] = prim.RotationOffset.W;
 
             // Sit target
-            LLVector3 sitTargetPos = prim.SitTargetPositionLL;
+            Vector3 sitTargetPos = prim.SitTargetPositionLL;
             row["SitTargetOffsetX"] = sitTargetPos.X;
             row["SitTargetOffsetY"] = sitTargetPos.Y;
             row["SitTargetOffsetZ"] = sitTargetPos.Z;
 
-            LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
+            Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
             row["SitTargetOrientW"] = sitTargetOrient.W;
             row["SitTargetOrientX"] = sitTargetOrient.X;
             row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1480,7 +1480,7 @@ namespace OpenSim.Data.MySQL
             }
             else
             {
-                row["LoopedSound"] = LLUUID.Zero;
+                row["LoopedSound"] = UUID.Zero;
                 row["LoopedSoundGain"] = 0.0f;
             }
 
@@ -1597,7 +1597,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="row"></param>
         /// <param name="land"></param>
         /// <param name="regionUUID"></param>
-        private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
+        private static void fillLandRow(DataRow row, LandData land, UUID regionUUID)
         {
             row["UUID"] = Util.ToRawUuidString(land.GlobalID);
             row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1642,7 +1642,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="row"></param>
         /// <param name="entry"></param>
         /// <param name="parcelID"></param>
-        private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID)
+        private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
         {
             row["LandUUID"] = Util.ToRawUuidString(parcelID);
             row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID);
@@ -1657,7 +1657,7 @@ namespace OpenSim.Data.MySQL
         private PrimitiveBaseShape buildShape(DataRow row)
         {
             PrimitiveBaseShape s = new PrimitiveBaseShape();
-            s.Scale = new LLVector3(
+            s.Scale = new Vector3(
                 Convert.ToSingle(row["ScaleX"]),
                 Convert.ToSingle(row["ScaleY"]),
                 Convert.ToSingle(row["ScaleZ"])
@@ -1778,7 +1778,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="prim"></param>
         /// <param name="sceneGroupID"></param>
         /// <param name="regionUUID"></param>
-        private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
+        private void addPrim(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
         {
             lock (m_dataSet)
             {
@@ -1816,7 +1816,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="primID"></param>
         /// <param name="items"></param>
-        public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
 
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 8d0b177..42983b1 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using MySql.Data.MySqlClient;
@@ -221,15 +221,15 @@ namespace OpenSim.Data.MySQL
 
         #region User Friends List Data
 
-        public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
+        public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
             int dtvalue = Util.UnixTimeSinceEpoch();
 
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?ownerID"] = friendlistowner.UUID.ToString();
-            param["?friendID"] = friend.UUID.ToString();
+            param["?ownerID"] = friendlistowner.ToString();
+            param["?friendID"] = friend.ToString();
             param["?friendPerms"] = perms.ToString();
             param["?datetimestamp"] = dtvalue.ToString();
 
@@ -265,13 +265,13 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
+        public override void RemoveUserFriend(UUID friendlistowner, UUID friend)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?ownerID"] = friendlistowner.UUID.ToString();
-            param["?friendID"] = friend.UUID.ToString();
+            param["?ownerID"] = friendlistowner.ToString();
+            param["?friendID"] = friend.ToString();
 
             try
             {
@@ -299,13 +299,13 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
+        public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?ownerID"] = friendlistowner.UUID.ToString();
-            param["?friendID"] = friend.UUID.ToString();
+            param["?ownerID"] = friendlistowner.ToString();
+            param["?friendID"] = friend.ToString();
             param["?friendPerms"] = perms.ToString();
 
             try
@@ -330,13 +330,13 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
+        public override List<FriendListItem> GetUserFriendList(UUID friendlistowner)
         {
             MySQLSuperManager dbm = GetLockedConnection();
             List<FriendListItem> Lfli = new List<FriendListItem>();
 
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?ownerID"] = friendlistowner.UUID.ToString();
+            param["?ownerID"] = friendlistowner.ToString();
 
             try
             {
@@ -352,8 +352,8 @@ namespace OpenSim.Data.MySQL
                 while (reader.Read())
                 {
                     FriendListItem fli = new FriendListItem();
-                    fli.FriendListOwner = new LLUUID((string) reader["ownerID"]);
-                    fli.Friend = new LLUUID((string) reader["friendID"]);
+                    fli.FriendListOwner = new UUID((string) reader["ownerID"]);
+                    fli.Friend = new UUID((string) reader["friendID"]);
                     fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]);
 
                     // This is not a real column in the database table, it's a joined column from the opposite record
@@ -381,12 +381,12 @@ namespace OpenSim.Data.MySQL
 
         #endregion
 
-        public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
+        public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
         {
             //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
         }
 
-        public override List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
@@ -413,7 +413,7 @@ namespace OpenSim.Data.MySQL
                     while (reader.Read())
                     {
                         AvatarPickerAvatar user = new AvatarPickerAvatar();
-                        user.AvatarID = new LLUUID((string) reader["UUID"]);
+                        user.AvatarID = new UUID((string) reader["UUID"]);
                         user.firstName = (string) reader["username"];
                         user.lastName = (string) reader["lastname"];
                         returnlist.Add(user);
@@ -449,7 +449,7 @@ namespace OpenSim.Data.MySQL
                     while (reader.Read())
                     {
                         AvatarPickerAvatar user = new AvatarPickerAvatar();
-                        user.AvatarID = new LLUUID((string) reader["UUID"]);
+                        user.AvatarID = new UUID((string) reader["UUID"]);
                         user.firstName = (string) reader["username"];
                         user.lastName = (string) reader["lastname"];
                         returnlist.Add(user);
@@ -476,7 +476,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="uuid">User UUID</param>
         /// <returns>User profile data</returns>
-        public override UserProfileData GetUserByUUID(LLUUID uuid)
+        public override UserProfileData GetUserByUUID(UUID uuid)
         {
             MySQLSuperManager dbm = GetLockedConnection();
             try
@@ -533,13 +533,13 @@ namespace OpenSim.Data.MySQL
         /// <param name="AgentID"></param>
         /// <param name="WebLoginKey"></param>
         /// <remarks>is it still used ?</remarks>
-        public override void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
+        public override void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
             Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?UUID"] = AgentID.UUID.ToString();
-            param["?webLoginKey"] = WebLoginKey.UUID.ToString();
+            param["?UUID"] = AgentID.ToString();
+            param["?webLoginKey"] = WebLoginKey.ToString();
 
             try
             {
@@ -565,7 +565,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="uuid">The accounts UUID</param>
         /// <returns>The users session</returns>
-        public override UserAgentData GetAgentByUUID(LLUUID uuid)
+        public override UserAgentData GetAgentByUUID(UUID uuid)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
@@ -682,7 +682,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="to">The receivers account ID</param>
         /// <param name="amount">The amount to transfer</param>
         /// <returns>Success?</returns>
-        public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount)
+        public override bool MoneyTransferRequest(UUID from, UUID to, uint amount)
         {
             return false;
         }
@@ -695,7 +695,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="to">The receivers account ID</param>
         /// <param name="item">The item to transfer</param>
         /// <returns>Success?</returns>
-        public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
+        public override bool InventoryTransferRequest(UUID from, UUID to, UUID item)
         {
             return false;
         }
@@ -705,7 +705,7 @@ namespace OpenSim.Data.MySQL
         /// TODO: stubs for now to get us to a compiling state gently
         /// override
         /// </summary>
-        public override AvatarAppearance GetUserAppearance(LLUUID user)
+        public override AvatarAppearance GetUserAppearance(UUID user)
         {
             MySQLSuperManager dbm = GetLockedConnection();
             try
@@ -744,7 +744,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="user">The user UUID</param>
         /// <param name="appearance">The avatar appearance</param>
         // override
-        public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
+        public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
         {
             MySQLSuperManager dbm = GetLockedConnection();
             try
@@ -783,7 +783,7 @@ namespace OpenSim.Data.MySQL
             get { return "0.1"; }
         }
 
-        public Hashtable GetUserAttachments(LLUUID agentID)
+        public Hashtable GetUserAttachments(UUID agentID)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
@@ -814,7 +814,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void UpdateUserAttachments(LLUUID agentID, Hashtable data)
+        public void UpdateUserAttachments(UUID agentID, Hashtable data)
         {
             MySQLSuperManager dbm = GetLockedConnection();
             try
@@ -827,7 +827,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public override void ResetAttachments(LLUUID userID)
+        public override void ResetAttachments(UUID userID)
         {
             MySQLSuperManager dbm = GetLockedConnection();
 
@@ -847,4 +847,4 @@ namespace OpenSim.Data.MySQL
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
index 80fb9ff..7431433 100644
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
@@ -27,7 +27,7 @@
 
 using System;
 using System.Data;
-using libsecondlife;
+using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
 namespace OpenSim.Data.NHibernate
 {
     [Serializable]
-    public class LLQuaternionUserType: IUserType
+    public class QuaternionUserType: IUserType
     {
         public object Assemble(object cached, object owner)
         {
@@ -49,9 +49,8 @@ namespace OpenSim.Data.NHibernate
 
         public object DeepCopy(object quat)
         {
-            // silly libsecondlife having no copy constructor
-            LLQuaternion q = (LLQuaternion) quat;
-            return new LLQuaternion(q.X, q.Y, q.Z, q.W);
+            Quaternion q = (Quaternion)quat;
+            return new Quaternion(q);
         }
 
         public object Disassemble(object quat)
@@ -79,14 +78,14 @@ namespace OpenSim.Data.NHibernate
             int w = rs.GetOrdinal(names[3]);
             if (!rs.IsDBNull(x))
             {
-                quat = new LLQuaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]);
+                quat = new Quaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]);
             }
             return quat;
         }
 
         public void NullSafeSet(IDbCommand cmd, object obj, int index)
         {
-            LLQuaternion quat = (LLQuaternion)obj;
+            Quaternion quat = (Quaternion)obj;
             ((IDataParameter)cmd.Parameters[index]).Value = quat.X;
             ((IDataParameter)cmd.Parameters[index + 1]).Value = quat.Y;
             ((IDataParameter)cmd.Parameters[index + 2]).Value = quat.Z;
@@ -100,7 +99,7 @@ namespace OpenSim.Data.NHibernate
 
         public Type ReturnedType
         {
-            get { return typeof(LLQuaternion); }
+            get { return typeof(Quaternion); }
         }
 
         public SqlType[] SqlTypes
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
index 0f10344..a7781a3 100644
--- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
@@ -27,7 +27,7 @@
 
 using System;
 using System.Data;
-using libsecondlife;
+using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
 namespace OpenSim.Data.NHibernate
 {
     [Serializable]
-    public class LLUUIDUserType: IUserType
+    public class UUIDUserType: IUserType
     {
         public object Assemble(object cached, object owner)
         {
@@ -75,7 +75,7 @@ namespace OpenSim.Data.NHibernate
             if (!rs.IsDBNull(ord))
             {
                 string first = (string)rs.GetString(ord);
-                uuid = new LLUUID(first);
+                uuid = new UUID(first);
             }
 
             return uuid;
@@ -83,7 +83,7 @@ namespace OpenSim.Data.NHibernate
 
         public void NullSafeSet(IDbCommand cmd, object obj, int index)
         {
-            LLUUID uuid = (LLUUID)obj;
+            UUID uuid = (UUID)obj;
             ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString();
         }
 
@@ -94,7 +94,7 @@ namespace OpenSim.Data.NHibernate
 
         public Type ReturnedType
         {
-            get { return typeof(LLUUID); }
+            get { return typeof(UUID); }
         }
 
         public SqlType[] SqlTypes
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
index d2df2c4..cdd15ec 100644
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -27,7 +27,7 @@
 
 using System;
 using System.Data;
-using libsecondlife;
+using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
 namespace OpenSim.Data.NHibernate
 {
     [Serializable]
-    public class LLVector3UserType: IUserType
+    public class Vector3UserType: IUserType
     {
         public object Assemble(object cached, object owner)
         {
@@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate
 
         public object DeepCopy(object vector)
         {
-            return new LLVector3((LLVector3) vector);
+            return new Vector3((Vector3) vector);
         }
 
         public object Disassemble(object vector)
@@ -76,14 +76,14 @@ namespace OpenSim.Data.NHibernate
             int z = rs.GetOrdinal(names[2]);
             if (!rs.IsDBNull(x))
             {
-                vector = new LLVector3((Single)rs[x], (Single)rs[y], (Single)rs[z]);
+                vector = new Vector3((Single)rs[x], (Single)rs[y], (Single)rs[z]);
             }
             return vector;
         }
 
         public void NullSafeSet(IDbCommand cmd, object obj, int index)
         {
-            LLVector3 vector = (LLVector3)obj;
+            Vector3 vector = (Vector3)obj;
             ((IDataParameter)cmd.Parameters[index]).Value = vector.X;
             ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y;
             ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z;
@@ -96,7 +96,7 @@ namespace OpenSim.Data.NHibernate
 
         public Type ReturnedType
         {
-            get { return typeof(LLVector3); }
+            get { return typeof(Vector3); }
         }
 
         public SqlType[] SqlTypes
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 400451f..6ee527e 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Cfg;
@@ -101,7 +101,7 @@ namespace OpenSim.Data.NHibernate
 
         }
 
-        override public AssetBase FetchAsset(LLUUID uuid)
+        override public AssetBase FetchAsset(UUID uuid)
         {
             try
             {
@@ -163,13 +163,13 @@ namespace OpenSim.Data.NHibernate
         //                                            asset.InvType, temporary, local, assetLength));
         // }
 
-        override public bool ExistsAsset(LLUUID uuid)
+        override public bool ExistsAsset(UUID uuid)
         {
             m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid);
             return (FetchAsset(uuid) != null);
         }
 
-        public void DeleteAsset(LLUUID uuid)
+        public void DeleteAsset(UUID uuid)
         {
 
         }
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 657a7b2..20dad1a 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Cfg;
@@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="item">The UUID of the item to be returned</param>
         /// <returns>A class containing item information</returns>
-        public InventoryItemBase getInventoryItem(LLUUID item)
+        public InventoryItemBase getInventoryItem(UUID item)
         {
             try
             {
@@ -163,7 +163,7 @@ namespace OpenSim.Data.NHibernate
         ///
         /// </summary>
         /// <param name="item"></param>
-        public void deleteInventoryItem(LLUUID itemID)
+        public void deleteInventoryItem(UUID itemID)
         {
             using (ITransaction transaction = session.BeginTransaction())
             {
@@ -177,7 +177,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="folder">The UUID of the folder to be returned</param>
         /// <returns>A class containing folder information</returns>
-        public InventoryFolderBase getInventoryFolder(LLUUID folder)
+        public InventoryFolderBase getInventoryFolder(UUID folder)
         {
             try
             {
@@ -235,7 +235,7 @@ namespace OpenSim.Data.NHibernate
         ///
         /// </summary>
         /// <param name="folder"></param>
-        public void deleteInventoryFolder(LLUUID folderID)
+        public void deleteInventoryFolder(UUID folderID)
         {
             using (ITransaction transaction = session.BeginTransaction())
             {
@@ -245,12 +245,12 @@ namespace OpenSim.Data.NHibernate
         }
 
         // useful private methods
-        private bool ExistsItem(LLUUID uuid)
+        private bool ExistsItem(UUID uuid)
         {
             return (getInventoryItem(uuid) != null) ? true : false;
         }
 
-        private bool ExistsFolder(LLUUID uuid)
+        private bool ExistsFolder(UUID uuid)
         {
             return (getInventoryFolder(uuid) != null) ? true : false;
         }
@@ -314,7 +314,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="folderID">The UUID of the target folder</param>
         /// <returns>A List of InventoryItemBase items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
             // try {
             ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase));
@@ -332,16 +332,16 @@ namespace OpenSim.Data.NHibernate
             //                 }
         }
 
-        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
+        public List<InventoryFolderBase> getUserRootFolders(UUID user)
         {
             return new List<InventoryFolderBase>();
         }
 
         // see InventoryItemBase.getUserRootFolder
-        public InventoryFolderBase getUserRootFolder(LLUUID user)
+        public InventoryFolderBase getUserRootFolder(UUID user)
         {
             ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
-            criteria.Add(Expression.Eq("ParentID", LLUUID.Zero));
+            criteria.Add(Expression.Eq("ParentID", UUID.Zero));
             criteria.Add(Expression.Eq("Owner", user));
             foreach (InventoryFolderBase folder in criteria.List())
             {
@@ -356,7 +356,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="folders">list where folders will be appended</param>
         /// <param name="parentID">ID of parent</param>
-        private void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID)
+        private void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
         {
             ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
             criteria.Add(Expression.Eq("ParentID", parentID));
@@ -371,7 +371,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="parentID">The folder to get subfolders for</param>
         /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             getInventoryFolders(ref folders, parentID);
@@ -379,7 +379,7 @@ namespace OpenSim.Data.NHibernate
         }
 
         // See IInventoryDataPlugin
-        public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID)
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
         {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             getInventoryFolders(ref folders, parentID);
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 9682d87..07bf05c 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Cfg;
@@ -109,7 +109,7 @@ namespace OpenSim.Data.NHibernate
         {
         }
 
-        public RegionSettings LoadRegionSettings(LLUUID regionUUID)
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             return null;
         }
@@ -162,7 +162,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="obj">the object</param>
         /// <param name="regionUUID">the region UUID</param>
-        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             try
             {
@@ -179,7 +179,7 @@ namespace OpenSim.Data.NHibernate
             }
         }
 
-        private SceneObjectGroup LoadObject(LLUUID uuid, LLUUID region)
+        private SceneObjectGroup LoadObject(UUID uuid, UUID region)
         {
             SceneObjectGroup group = new SceneObjectGroup();
 
@@ -210,7 +210,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="obj">the object</param>
         /// <param name="regionUUID">the region UUID</param>
-        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
+        public void RemoveObject(UUID obj, UUID regionUUID)
         {
             SceneObjectGroup g = LoadObject(obj, regionUUID);
             foreach (SceneObjectPart p in g.Children.Values)
@@ -219,7 +219,7 @@ namespace OpenSim.Data.NHibernate
             }
             session.Flush();
 
-            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
+            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
 
         }
 
@@ -228,9 +228,9 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="regionUUID">The region UUID</param>
         /// <returns>List of loaded groups</returns>
-        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
-            Dictionary<LLUUID, SceneObjectGroup> SOG = new Dictionary<LLUUID, SceneObjectGroup>();
+            Dictionary<UUID, SceneObjectGroup> SOG = new Dictionary<UUID, SceneObjectGroup>();
             List<SceneObjectGroup> ret = new List<SceneObjectGroup>();
 
             ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart));
@@ -276,7 +276,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="ter">terrain heightfield</param>
         /// <param name="regionID">region UUID</param>
-        public void StoreTerrain(double[,] ter, LLUUID regionID)
+        public void StoreTerrain(double[,] ter, UUID regionID)
         {
             lock (this) {
                 Terrain t = new Terrain(regionID, ter);
@@ -289,7 +289,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="regionID">the region UUID</param>
         /// <returns>Heightfield data</returns>
-        public double[,] LoadTerrain(LLUUID regionID)
+        public double[,] LoadTerrain(UUID regionID)
         {
             try
             {
@@ -307,7 +307,7 @@ namespace OpenSim.Data.NHibernate
         ///
         /// </summary>
         /// <param name="globalID"></param>
-        public void RemoveLandObject(LLUUID globalID)
+        public void RemoveLandObject(UUID globalID)
         {
 
         }
@@ -326,7 +326,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="regionUUID"></param>
         /// <returns></returns>
-        public List<LandData> LoadLandObjects(LLUUID regionUUID)
+        public List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landDataForRegion = new List<LandData>();
 
@@ -347,7 +347,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="regionUUID">the region UUID</param>
         /// <returns>The banlist</returns>
-        public List<EstateBan> LoadRegionBanList(LLUUID regionUUID)
+        public List<EstateBan> LoadRegionBanList(UUID regionUUID)
         {
             List<EstateBan> regionbanlist = new List<EstateBan>();
 
@@ -395,7 +395,7 @@ namespace OpenSim.Data.NHibernate
         /// </summary>
         /// <param name="primID"></param>
         /// <param name="items"></param>
-        public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
              ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem));
              criteria.Add(Expression.Eq("ParentPartID", primID));
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 8435762..459b8e7 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Cfg;
@@ -90,7 +90,7 @@ namespace OpenSim.Data.NHibernate
             m.Update();
         }
 
-        private bool ExistsUser(LLUUID uuid)
+        private bool ExistsUser(UUID uuid)
         {
             UserProfileData user = null;
             try
@@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate
             return (user != null);
         }
 
-        override public UserProfileData GetUserByUUID(LLUUID uuid)
+        override public UserProfileData GetUserByUUID(UUID uuid)
         {
             UserProfileData user;
             // TODO: I'm sure I'll have to do something silly here
@@ -136,7 +136,7 @@ namespace OpenSim.Data.NHibernate
             }
         }
 
-        private void SetAgentData(LLUUID uuid, UserAgentData agent)
+        private void SetAgentData(UUID uuid, UserAgentData agent)
         {
             if (agent == null)
             {
@@ -190,7 +190,7 @@ namespace OpenSim.Data.NHibernate
             session.Update(agent);
         }
 
-        override public UserAgentData GetAgentByUUID(LLUUID uuid)
+        override public UserAgentData GetAgentByUUID(UUID uuid)
         {
             try
             {
@@ -225,7 +225,7 @@ namespace OpenSim.Data.NHibernate
             return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
         }
 
-        override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
         {
             List<AvatarPickerAvatar> results = new List<AvatarPickerAvatar>();
             string[] querysplit;
@@ -249,18 +249,18 @@ namespace OpenSim.Data.NHibernate
         }
 
         // TODO: actually implement these
-        public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { return; }
-        public override void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) { return; }
-        public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) { return; }
-        public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) { return; }
-        public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) { return; }
-        public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) { return new List<FriendListItem>(); }
-        public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) { return true; }
-        public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory) { return true; }
+        public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { return; }
+        public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; }
+        public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; }
+        public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; }
+        public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) { return; }
+        public override List<FriendListItem> GetUserFriendList(UUID friendlistowner) { return new List<FriendListItem>(); }
+        public override bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return true; }
+        public override bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return true; }
 
         /// Appearance
         /// TODO: stubs for now to get us to a compiling state gently
-        public override AvatarAppearance GetUserAppearance(LLUUID user)
+        public override AvatarAppearance GetUserAppearance(UUID user)
         {
             AvatarAppearance appearance;
             // TODO: I'm sure I'll have to do something silly here
@@ -272,7 +272,7 @@ namespace OpenSim.Data.NHibernate
             return appearance;
         }
 
-        private bool ExistsAppearance(LLUUID uuid)
+        private bool ExistsAppearance(UUID uuid)
         {
             AvatarAppearance appearance;
             try {
@@ -285,7 +285,7 @@ namespace OpenSim.Data.NHibernate
         }
 
 
-        public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
+        public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
         {
             if (appearance == null)
                 return;
@@ -303,7 +303,7 @@ namespace OpenSim.Data.NHibernate
             }
         }
 
-        public override void ResetAttachments(LLUUID userID)
+        public override void ResetAttachments(UUID userID)
         {
         }
 
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index f6b648a..7c3d8cf 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
-        <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+        <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
         <property name="Type" type="System.SByte" />
@@ -11,4 +11,4 @@
         <property name="Temporary" type="boolean" />
         <property name="Data" type="binary" />
     </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
index 6d918fe..6afe9fa 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="false">
-        <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate">
+        <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
             <generator class="assigned" /> 
         </id> 
         <property name="Type" type="Int16" />
         <property name="Version" type="System.UInt16" />
-        <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         <property name="Name" type="String" length="64" />
     </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
index f1b4007..9a4d7ca 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false">
-        <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+        <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
         <property name="InvType" type="System.Int32" />
         <property name="AssetType" type="System.Int32" />
-        <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Folder" index="item_folder_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Owner" index="item_owner_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Creator" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="Folder" index="item_folder_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="Owner" index="item_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="Creator" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         <property name="Name" type="String" length="64" />
         <property name="Description" type="String" length="64" />
         <property name="NextPermissions" type="System.UInt32" />
         <property name="CurrentPermissions" type="System.UInt32" />
         <property name="BasePermissions" type="System.UInt32" />
         <property name="EveryOnePermissions" type="System.UInt32" />
-        <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         <property name="GroupOwned" type="boolean" />
         <property name="SalePrice" type="System.Int32" />
         <property name="SaleType" type="System.Byte" />
         <property name="Flags" type="System.UInt32" />
         <property name="CreationDate" type="System.Int32" />
     </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index ef3ab9b..fe055bb 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Region.Environment.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false">
-        <id name="UUID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+        <id name="UUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id>
         <property name="ParentID" type="System.UInt32"/>
-        <property name="ParentUUID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="RegionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
+        <property name="ParentUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
+        <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
         <property name="CreationDate" type="System.Int32" />
         <property name="Name" type="String" length="255" />
         <property name="Text" type="String" length="255" />
@@ -15,10 +15,10 @@
         <property name="TouchName" type="String" length="255" />
         
         <property name="ObjectFlags" type="System.UInt32" />
-        <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
-        <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 
+        <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
+        <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
+        <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
+        <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> 
 
         <property name="OwnerMask" type="System.UInt32" />
         <property name="NextOwnerMask" type="System.UInt32" />
@@ -26,50 +26,50 @@
         <property name="EveryoneMask" type="System.UInt32" />
         <property name="BaseMask" type="System.UInt32" />
 
-        <property name="OffsetPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
+        <property name="OffsetPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
           <column name="PositionX" />
           <column name="PositionY" />
           <column name="PositionZ" />
         </property>
 
-        <property name="GroupPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
+        <property name="GroupPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
           <column name="GroupPositionX" />
           <column name="GroupPositionY" />
           <column name="GroupPositionZ" />
         </property>
 
-        <property name="Velocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
+        <property name="Velocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
           <column name="VelocityX" />
           <column name="VelocityY" />
           <column name="VelocityZ" />
         </property>
 
-        <property name="AngularVelocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
+        <property name="AngularVelocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
           <column name="AngularVelocityX" />
           <column name="AngularVelocityY" />
           <column name="AngularVelocityZ" />
         </property>
 
-        <property name="Acceleration" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
+        <property name="Acceleration" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
           <column name="AccelerationX" />
           <column name="AccelerationY" />
           <column name="AccelerationZ" />
         </property>
 
-        <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
+        <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
           <column name="SitTargetOffsetX" />
           <column name="SitTargetOffsetY" />
           <column name="SitTargetOffsetZ" />
         </property>
 
-        <property name="RotationOffset" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" >
+        <property name="RotationOffset" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
           <column name="RotationX" />
           <column name="RotationY" />
           <column name="RotationZ" />
           <column name="RotationW" />
         </property>
         
-        <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" >
+        <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
           <column name="SitTargetOrientX" />
           <column name="SitTargetOrientY" />
           <column name="SitTargetOrientZ" />
@@ -77,7 +77,7 @@
         </property>
         
         <component name="Shape">
-          <property name="Scale" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
+          <property name="Scale" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
             <column name="ScaleX" />
             <column name="ScaleY" />
             <column name="ScaleZ" />
@@ -105,22 +105,22 @@
         </component>
     </class>
     <class name="OpenSim.Data.NHibernate.Terrain, OpenSim.Data.NHibernate" table="Terrain" lazy="false">
-        <id name="RegionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+        <id name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
           <generator class="assigned" /> 
         </id>
         <property name="Map" type="System.Byte[]" />
     </class>
     <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false">
-      <id name="ItemID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+      <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
         <generator class="assigned" /> 
       </id>
-      <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
-      <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
+      <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> 
       <property name="CurrentPermissions" type="System.UInt32" />
       <property name="BasePermissions" type="System.UInt32" />
       <property name="EveryonePermissions" type="System.UInt32" />
@@ -132,4 +132,4 @@
       <property name="Flags" type="System.UInt32" />
       <property name="InvType" type="System.Int32" />
     </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
index 718cb98..0beddaf 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="false">
-        <id name="ProfileID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+        <id name="ProfileID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id>
         <property name="AgentIP" type="String" length="24" />
         <property name="AgentPort" type="Int32" />
         <property name="AgentOnline" type="boolean" />
-        <property name="SessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="SecureSessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="InitialRegion" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="Region" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="SessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="SecureSessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="InitialRegion" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="Region" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         <property name="LoginTime" type="Int32" />
         <property name="LogoutTime" type="Int32" />
         <property name="Handle" type="Int64" />
@@ -18,4 +18,4 @@
         <property name="PositionY" type="Single" />
         <property name="PositionZ" type="Single" />
     </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
index 06e9c1a..b633c34 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
   <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false">
-    <id name="Owner" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+    <id name="Owner" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
       <generator class="assigned" /> 
     </id>
-    <property name="BodyItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="BodyAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="SkinItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="SkinAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="HairItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="HairAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="EyesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="EyesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="ShirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="ShirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="PantsItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="PantsAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="ShoesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="ShoesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="SocksItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="SocksAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="JacketItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="JacketAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="GlovesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="GlovesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="UnderShirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="UnderShirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="UnderPantsItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="SkirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
-    <property name="SkirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="BodyItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="BodyAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="SkinItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="SkinAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="HairItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="HairAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="EyesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="EyesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="ShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="ShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="PantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="PantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="ShoesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="ShoesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="SocksItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="SocksAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="JacketItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="JacketAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="GlovesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="GlovesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="UnderShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="UnderShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="UnderPantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+    <property name="SkirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />    
+    <property name="SkirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
     <property name="Texture" type="OpenSim.Data.NHibernate.TextureUserType, OpenSim.Data.NHibernate" />
     <property name="VisualParams" type="binary" />
     <property name="Serial" type="Int32" />
   </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
index 4003628..873930b 100644
--- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="false">
-        <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
+        <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id>
         <property name="FirstName" index="user_firstname" type="String" length="32" />
         <property name="SurName" index="user_surname" type="String" length="32" />
         <property name="PasswordHash" type="String" length="32" />
         <property name="PasswordSalt" type="String" length="32" />
-        <property name="WebLoginKey" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="WebLoginKey" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         <property name="HomeRegionX" type="System.UInt32" />
         <property name="HomeRegionY" type="System.UInt32" />
         <property name="HomeLocationX" type="Single" />
@@ -19,12 +19,12 @@
         <property name="HomeLookAtZ" type="Single" />
         <property name="Created" type="Int32" />
         <property name="LastLogin" type="Int32" />
-        <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         <property name="UserInventoryURI" type="String" length="255"/>
         <property name="UserAssetURI" type="String" length="255"/>
-        <property name="Image" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="FirstLifeImage" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="Image" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="FirstLifeImage" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         <property name="AboutText" type="String" length="255" />
         <property name="FirstLifeAboutText" type="String" length="255" />
     </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
index 608f03e..dd0da44 100644
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -30,7 +30,7 @@ using System.IO;
 using System.Reflection;
 using OpenSim.Framework;
 using log4net;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate
 {
@@ -39,9 +39,9 @@ namespace OpenSim.Data.NHibernate
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private double[,] map;
-        private LLUUID regionID;
+        private UUID regionID;
 
-        public Terrain(LLUUID Region, double[,] array)
+        public Terrain(UUID Region, double[,] array)
         {
             map = array;
             regionID = Region;
@@ -51,10 +51,10 @@ namespace OpenSim.Data.NHibernate
         {
             map = new double[Constants.RegionSize, Constants.RegionSize];
             map.Initialize();
-            regionID = LLUUID.Zero;
+            regionID = UUID.Zero;
         }
 
-        public LLUUID RegionID
+        public UUID RegionID
         {
             get { return regionID; }
             set { regionID = value; }
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index f8aa704..ff949d4 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -27,7 +27,7 @@
 
 using System;
 using System.Data;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
@@ -53,12 +53,12 @@ namespace OpenSim.Data.NHibernate
             if (texture == null) 
             {
                 // TODO: should parametrize this texture out
-                return new LLObject.TextureEntry(new LLUUID(Constants.DefaultTexture));
+                return new Primitive.TextureEntry(new UUID(Constants.DefaultTexture));
             }
             else 
             {
-                byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes();
-                return new LLObject.TextureEntry(bytes, 0, bytes.Length);
+                byte[] bytes = ((Primitive.TextureEntry)texture).ToBytes();
+                return new Primitive.TextureEntry(bytes, 0, bytes.Length);
             }
         }
 
@@ -85,7 +85,7 @@ namespace OpenSim.Data.NHibernate
             if (!rs.IsDBNull(ord))
             {
                 byte[] bytes = (byte[])rs[ord];
-                texture = new LLObject.TextureEntry(bytes, 0, bytes.Length);
+                texture = new Primitive.TextureEntry(bytes, 0, bytes.Length);
             }
 
             return texture;
@@ -93,7 +93,7 @@ namespace OpenSim.Data.NHibernate
 
         public void NullSafeSet(IDbCommand cmd, object obj, int index)
         {
-            LLObject.TextureEntry texture = (LLObject.TextureEntry)obj;
+            Primitive.TextureEntry texture = (Primitive.TextureEntry)obj;
             ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes();
         }
 
@@ -104,7 +104,7 @@ namespace OpenSim.Data.NHibernate
 
         public Type ReturnedType
         {
-            get { return typeof(LLObject.TextureEntry); }
+            get { return typeof(Primitive.TextureEntry); }
         }
 
         public SqlType[] SqlTypes
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
index 76369bd..aea03d6 100644
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullDataStore.cs
@@ -26,7 +26,7 @@
  */
 
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
@@ -47,39 +47,39 @@ namespace OpenSim.Data.Null
         {
         }
 
-        public RegionSettings LoadRegionSettings(LLUUID regionUUID)
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             return null;
         }
 
-        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
         }
 
-        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
+        public void RemoveObject(UUID obj, UUID regionUUID)
         {
         }
 
         // see IRegionDatastore
-        public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
         }
 
-        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
             return new List<SceneObjectGroup>();
         }
 
-        public void StoreTerrain(double[,] ter, LLUUID regionID)
+        public void StoreTerrain(double[,] ter, UUID regionID)
         {
         }
 
-        public double[,] LoadTerrain(LLUUID regionID)
+        public double[,] LoadTerrain(UUID regionID)
         {
             return null;
         }
 
-        public void RemoveLandObject(LLUUID globalID)
+        public void RemoveLandObject(UUID globalID)
         {
         }
 
@@ -87,7 +87,7 @@ namespace OpenSim.Data.Null
         {
         }
 
-        public List<LandData> LoadLandObjects(LLUUID regionUUID)
+        public List<LandData> LoadLandObjects(UUID regionUUID)
         {
             return new List<LandData>();
         }
diff --git a/OpenSim/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs
index cb613c1..f584855 100644
--- a/OpenSim/Data/OpenSimDataReader.cs
+++ b/OpenSim/Data/OpenSimDataReader.cs
@@ -26,7 +26,7 @@
  */
 
 using System.Data;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data
@@ -37,25 +37,25 @@ namespace OpenSim.Data
         {
         }
 
-        public LLVector3 GetVector(string s)
+        public Vector3 GetVector(string s)
         {
             float x = GetFloat(s + "X");
             float y = GetFloat(s + "Y");
             float z = GetFloat(s + "Z");
 
-            LLVector3 vector = new LLVector3(x, y, z);
+            Vector3 vector = new Vector3(x, y, z);
 
             return vector;
         }
 
-        public LLQuaternion GetQuaternion(string s)
+        public Quaternion GetQuaternion(string s)
         {
             float x = GetFloat(s + "X");
             float y = GetFloat(s + "Y");
             float z = GetFloat(s + "Z");
             float w = GetFloat(s + "W");
 
-            LLQuaternion quaternion = new LLQuaternion(x, y, z, w);
+            Quaternion quaternion = new Quaternion(x, y, z, w);
 
             return quaternion;
         }
diff --git a/OpenSim/Data/OpenSimDatabaseConnector.cs b/OpenSim/Data/OpenSimDatabaseConnector.cs
index ee54f4f..68a4ee4 100644
--- a/OpenSim/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Data/OpenSimDatabaseConnector.cs
@@ -26,7 +26,7 @@
  */
 
 using System.Data;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data
@@ -39,9 +39,9 @@ namespace OpenSim.Data
 
         public override object ConvertToDbType(object value)
         {
-            if (value is LLUUID)
+            if (value is UUID)
             {
-                return ((LLUUID) value).UUID.ToString();
+                return ((UUID)value).ToString();
             }
 
             return base.ConvertToDbType(value);
diff --git a/OpenSim/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs
index ff375fb..a342494 100644
--- a/OpenSim/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Data/OpenSimObjectFieldMapper.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data
@@ -47,17 +47,17 @@ namespace OpenSim.Data
             string fieldName = FieldName;
             object value = GetParamValue(obj);
 
-            if (ValueType == typeof(LLVector3))
+            if (ValueType == typeof(Vector3))
             {
-                LLVector3 vector = (LLVector3)value;
+                Vector3 vector = (Vector3)value;
 
                 RawAddParam(command, fieldNames, fieldName + "X", vector.X);
                 RawAddParam(command, fieldNames, fieldName + "Y", vector.Y);
                 RawAddParam(command, fieldNames, fieldName + "Z", vector.Z);
             }
-            else if (ValueType == typeof(LLQuaternion))
+            else if (ValueType == typeof(Quaternion))
             {
-                LLQuaternion quaternion = (LLQuaternion)value;
+                Quaternion quaternion = (Quaternion)value;
 
                 RawAddParam(command, fieldNames, fieldName + "X", quaternion.X);
                 RawAddParam(command, fieldNames, fieldName + "Y", quaternion.Y);
@@ -76,18 +76,18 @@ namespace OpenSim.Data
 
             OpenSimDataReader osreader = (OpenSimDataReader) reader;
 
-            if (ValueType == typeof(LLVector3))
+            if (ValueType == typeof(Vector3))
             {
                 value = osreader.GetVector(FieldName);
             }
-            else if (ValueType == typeof(LLQuaternion))
+            else if (ValueType == typeof(Quaternion))
             {
                 value = osreader.GetQuaternion(FieldName);
             }
-            else if (ValueType == typeof(LLUUID))
+            else if (ValueType == typeof(UUID))
             {
                 Guid guid = reader.GetGuid(FieldName);
-                value = new LLUUID(guid);
+                value = new UUID(guid);
             }
             else
             {
diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
index a4e39a1..5a6b3db 100644
--- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
@@ -26,7 +26,7 @@
  */
 
 using System;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Data.Base;
 using OpenSim.Framework;
 
@@ -89,9 +89,9 @@ namespace OpenSim.Data
                                                delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileEnd; },
                                                delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileEnd = value; });
 
-            rowMapperSchema.AddMapping<LLVector3>("Scale",
+            rowMapperSchema.AddMapping<Vector3>("Scale",
                                                        delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.Scale; },
-                                                       delegate(PrimitiveBaseShapeRowMapper shape, LLVector3 value) { shape.Object.Scale = value; });
+                                                       delegate(PrimitiveBaseShapeRowMapper shape, Vector3 value) { shape.Object.Scale = value; });
 
             rowMapperSchema.AddMapping<sbyte>("PathTaperX",
                                               delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTaperX; },
@@ -143,7 +143,7 @@ namespace OpenSim.Data
             PrimitiveBaseShape shape = new PrimitiveBaseShape();
 
             PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, shape);
-            mapper.FillObject(reader);
+            mapper.FiPrimitive(reader);
 
             return mapper;
         }
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 9549b80..b4c7b3c 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -27,9 +27,10 @@
 
 using System;
 using System.Collections;
-using libsecondlife;
+using OpenMetaverse;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
+using OpenMetaverse;
 
 namespace OpenSim.Data
 {
@@ -51,7 +52,7 @@ namespace OpenSim.Data
         /// <summary>
         /// OGS/OpenSim Specific ID for a region
         /// </summary>
-        public LLUUID UUID;
+        public UUID UUID;
 
         /// <summary>
         /// Coordinates of the region
@@ -117,18 +118,18 @@ namespace OpenSim.Data
         /// <summary>
         /// Region Map Texture Asset
         /// </summary>
-        public LLUUID regionMapTextureID = new LLUUID("00000000-0000-1111-9999-000000000006");
+        public UUID regionMapTextureID = new UUID("00000000-0000-1111-9999-000000000006");
 
         /// <summary>
         /// this particular mod to the file provides support within the spec for RegionProfileData for the
         /// owner_uuid for the region
         /// </summary>
-        public LLUUID owner_uuid = LLUUID.Zero;
+        public UUID owner_uuid = UUID.Zero;
 
         /// <summary>
         /// OGS/OpenSim Specific original ID for a region after move/split
         /// </summary>
-        public LLUUID originUUID;
+        public UUID originUUID;
 
         /// <summary>
         /// Request sim data based on arbitrary key/value
@@ -161,7 +162,7 @@ namespace OpenSim.Data
                 simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
                 simData.serverURI = (string) responseData["server_uri"];
                 simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/";
-                simData.UUID = new LLUUID((string) responseData["region_UUID"]);
+                simData.UUID = new UUID((string) responseData["region_UUID"]);
                 simData.regionName = (string) responseData["region_name"];
             }
 
@@ -177,10 +178,10 @@ namespace OpenSim.Data
         /// <param name="gridserver_recvkey"></param>
         /// <returns>The sim profile.  Null if there was a request failure</returns>
         /// <remarks>This method should be statics</remarks>
-        public static RegionProfileData RequestSimProfileData(LLUUID region_uuid, Uri gridserver_url,
+        public static RegionProfileData RequestSimProfileData(UUID region_uuid, Uri gridserver_url,
                                                        string gridserver_sendkey, string gridserver_recvkey)
         {
-            return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.UUID.ToString());
+            return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.Guid.ToString());
         }
 
         /// <summary>
diff --git a/OpenSim/Data/ReservationData.cs b/OpenSim/Data/ReservationData.cs
index 43fb299..dac1b7b 100644
--- a/OpenSim/Data/ReservationData.cs
+++ b/OpenSim/Data/ReservationData.cs
@@ -26,13 +26,13 @@
  */
 
 using System;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Data
 {
     public class ReservationData
     {
-        public LLUUID userUUID = LLUUID.Zero;
+        public UUID userUUID = UUID.Zero;
         public int reservationMinX = 0;
         public int reservationMinY = 0;
         public int reservationMaxX = 65536;
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 220cebf..8b14f09 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Data;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
@@ -87,7 +87,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="uuid">UUID of ... ?</param>
         /// <returns>Asset base</returns>
-        override public AssetBase FetchAsset(LLUUID uuid)
+        override public AssetBase FetchAsset(UUID uuid)
         {
             lock (this)
             {
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="uuid">The asset UUID</param>
         /// <returns>True if exist, or false.</returns>
-        override public bool ExistsAsset(LLUUID uuid)
+        override public bool ExistsAsset(UUID uuid)
         {
             lock (this) {
                 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
@@ -217,7 +217,7 @@ namespace OpenSim.Data.SQLite
         /// Delete an asset from database
         /// </summary>
         /// <param name="uuid"></param>
-        public void DeleteAsset(LLUUID uuid)
+        public void DeleteAsset(UUID uuid)
         {
             using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
             {
@@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite
             // back out.  Not enough time to figure it out yet.
             AssetBase asset = new AssetBase();
 
-            asset.FullID = new LLUUID((String) row["UUID"]);
+            asset.FullID = new UUID((String) row["UUID"]);
             asset.Name = (String) row["Name"];
             asset.Description = (String) row["Description"];
             asset.Type = Convert.ToSByte(row["Type"]);
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index ffe7644..1245caa 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.IO;
 using System.Reflection;
 using System.Threading;
-using libsecondlife;
+using OpenMetaverse;
 using Mono.Data.SqliteClient;
 using log4net;
 using OpenSim.Framework;
@@ -83,7 +83,7 @@ namespace OpenSim.Data.SQLite
             get { return new List<string>(m_FieldMap.Keys).ToArray(); }
         }
 
-        public EstateSettings LoadEstateSettings(LLUUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID)
         {
             EstateSettings es = new EstateSettings();
             es.OnSave += StoreEstateSettings;
@@ -109,11 +109,11 @@ namespace OpenSim.Data.SQLite
                         else
                             m_FieldMap[name].SetValue(es, false);
                     }
-                    else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
+                    else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
                     {
-                        LLUUID uuid = LLUUID.Zero;
+                        UUID uuid = UUID.Zero;
 
-                        LLUUID.TryParse(r[name].ToString(), out uuid);
+                        UUID.TryParse(r[name].ToString(), out uuid);
                         m_FieldMap[name].SetValue(es, uuid);
                     }
                     else
@@ -258,8 +258,8 @@ namespace OpenSim.Data.SQLite
             {
                 EstateBan eb = new EstateBan();
 
-                LLUUID uuid = new LLUUID();
-                LLUUID.TryParse(r["bannedUUID"].ToString(), out uuid);
+                UUID uuid = new UUID();
+                UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
 
                 eb.bannedUUID = uuid;
                 eb.bannedIP = "0.0.0.0";
@@ -292,7 +292,7 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        void SaveUUIDList(uint EstateID, string table, LLUUID[] data)
+        void SaveUUIDList(uint EstateID, string table, UUID[] data)
         {
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
 
@@ -305,7 +305,7 @@ namespace OpenSim.Data.SQLite
 
             cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
 
-            foreach (LLUUID uuid in data)
+            foreach (UUID uuid in data)
             {
                 cmd.Parameters.Add(":EstateID", EstateID.ToString());
                 cmd.Parameters.Add(":uuid", uuid.ToString());
@@ -315,9 +315,9 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        LLUUID[] LoadUUIDList(uint EstateID, string table)
+        UUID[] LoadUUIDList(uint EstateID, string table)
         {
-            List<LLUUID> uuids = new List<LLUUID>();
+            List<UUID> uuids = new List<UUID>();
 
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
 
@@ -330,8 +330,8 @@ namespace OpenSim.Data.SQLite
             {
                 // EstateBan eb = new EstateBan();
 
-                LLUUID uuid = new LLUUID();
-                LLUUID.TryParse(r["uuid"].ToString(), out uuid);
+                UUID uuid = new UUID();
+                UUID.TryParse(r["uuid"].ToString(), out uuid);
 
                 uuids.Add(uuid);
             }
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 8c4574e..f715c0e 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -162,7 +162,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="uuid">The region UUID</param>
         /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
+        override public RegionProfileData GetProfileByUUID(UUID uuid)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
             param["uuid"] = uuid.ToString();
@@ -181,7 +181,7 @@ namespace OpenSim.Data.SQLite
         /// Returns a list of avatar and UUIDs that match the query
         /// </summary>
         /// <remarks>do nothing yet</remarks>
-        public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
         {
             //Do nothing yet
             List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
@@ -217,14 +217,14 @@ namespace OpenSim.Data.SQLite
         /// <param name="handle">The attempted regionHandle of the challenger</param>
         /// <param name="authkey">The secret</param>
         /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
+        override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
         {
             bool throwHissyFit = false; // Should be true by 1.0
 
             if (throwHissyFit)
                 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
 
-            RegionProfileData data = GetProfileByLLUUID(uuid);
+            RegionProfileData data = GetProfileByUUID(uuid);
 
             return (handle == data.regionHandle && authkey == data.regionSecret);
         }
@@ -238,7 +238,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="authhash"></param>
         /// <param name="challenge"></param>
         /// <returns></returns>
-        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
+        public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
         {
             // SHA512Managed HashProvider = new SHA512Managed();
             // Encoding TextProvider = new UTF8Encoding();
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 4c35ac2..ca7e612 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
@@ -109,13 +109,13 @@ namespace OpenSim.Data.SQLite
         public InventoryItemBase buildItem(DataRow row)
         {
             InventoryItemBase item = new InventoryItemBase();
-            item.ID = new LLUUID((string) row["UUID"]);
-            item.AssetID = new LLUUID((string) row["assetID"]);
+            item.ID = new UUID((string) row["UUID"]);
+            item.AssetID = new UUID((string) row["assetID"]);
             item.AssetType = Convert.ToInt32(row["assetType"]);
             item.InvType = Convert.ToInt32(row["invType"]);
-            item.Folder = new LLUUID((string) row["parentFolderID"]);
-            item.Owner = new LLUUID((string) row["avatarID"]);
-            item.Creator = new LLUUID((string) row["creatorsID"]);
+            item.Folder = new UUID((string) row["parentFolderID"]);
+            item.Owner = new UUID((string) row["avatarID"]);
+            item.Creator = new UUID((string) row["creatorsID"]);
             item.Name = (string) row["inventoryName"];
             item.Description = (string) row["inventoryDescription"];
 
@@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite
                 item.CreationDate = Convert.ToInt32(row["creationDate"]);
 
             if (!Convert.IsDBNull(row["groupID"]))
-                item.GroupID = new LLUUID((string)row["groupID"]);
+                item.GroupID = new UUID((string)row["groupID"]);
 
             if (!Convert.IsDBNull(row["groupOwned"]))
                 item.GroupOwned = Convert.ToBoolean(row["groupOwned"]);
@@ -317,7 +317,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="folderID">The UUID of the target folder</param>
         /// <returns>A List of InventoryItemBase items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
             lock (ds)
             {
@@ -339,20 +339,20 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="user">The user whos inventory is to be searched</param>
         /// <returns>A list of folder objects</returns>
-        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
+        public List<InventoryFolderBase> getUserRootFolders(UUID user)
         {
             return new List<InventoryFolderBase>();
         }
 
         // see InventoryItemBase.getUserRootFolder
-        public InventoryFolderBase getUserRootFolder(LLUUID user)
+        public InventoryFolderBase getUserRootFolder(UUID user)
         {
             lock (ds)
             {
                 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
                 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
                 string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" +
-                                   Util.ToRawUuidString(LLUUID.Zero) + "'";
+                                   Util.ToRawUuidString(UUID.Zero) + "'";
                 DataRow[] rows = inventoryFolderTable.Select(selectExp);
                 foreach (DataRow row in rows)
                 {
@@ -378,7 +378,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="folders">list where folders will be appended</param>
         /// <param name="parentID">ID of parent</param>
-        protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID)
+        protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
         {
             lock (ds)
             {
@@ -398,7 +398,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="parentID">The folder to get subfolders for</param>
         /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             getInventoryFolders(ref folders, Util.ToRawUuidString(parentID));
@@ -410,7 +410,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="parentID"></param>
         /// <returns></returns>
-        public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID)
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
         {
             /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
                  * - We will only need to hit the database twice instead of n times.
@@ -441,7 +441,7 @@ namespace OpenSim.Data.SQLite
                 if (parentRow.GetLength(0) >= 1)                    // No result means parent folder does not exist
                 {
                     parentFolder = buildFolder(parentRow[0]);
-                    LLUUID agentID = parentFolder.Owner;
+                    UUID agentID = parentFolder.Owner;
                     selectExp = "agentID = '" + Util.ToRawUuidString(agentID) + "'";
                     folderRows = inventoryFolderTable.Select(selectExp);
                 }
@@ -451,7 +451,7 @@ namespace OpenSim.Data.SQLite
                     /* if we're querying the root folder, just return an unordered list of all folders in the user's
                      * inventory
                      */
-                    if (parentFolder.ParentID == LLUUID.Zero)
+                    if (parentFolder.ParentID == UUID.Zero)
                     {
                         foreach (DataRow row in folderRows)
                         {
@@ -470,13 +470,13 @@ namespace OpenSim.Data.SQLite
                     {                                                         // Querying a non-root folder
 
                         // Build a hash table of all user's inventory folders, indexed by each folder's parent ID
-                        Dictionary<LLUUID, List<InventoryFolderBase>> hashtable =
-                            new Dictionary<LLUUID, List<InventoryFolderBase>>(folderRows.GetLength(0));
+                        Dictionary<UUID, List<InventoryFolderBase>> hashtable =
+                            new Dictionary<UUID, List<InventoryFolderBase>>(folderRows.GetLength(0));
 
                         foreach (DataRow row in folderRows)
                         {
                             InventoryFolderBase curFolder = buildFolder(row);
-                            if (curFolder.ParentID != LLUUID.Zero) // Discard root of tree - not needed
+                            if (curFolder.ParentID != UUID.Zero) // Discard root of tree - not needed
                             {
                                 if (hashtable.ContainsKey(curFolder.ParentID))
                                 {
@@ -514,7 +514,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="item">The UUID of the item to be returned</param>
         /// <returns>A class containing item information</returns>
-        public InventoryItemBase getInventoryItem(LLUUID item)
+        public InventoryItemBase getInventoryItem(UUID item)
         {
             lock (ds)
             {
@@ -535,7 +535,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="folder">The UUID of the folder to be returned</param>
         /// <returns>A class containing folder information</returns>
-        public InventoryFolderBase getInventoryFolder(LLUUID folder)
+        public InventoryFolderBase getInventoryFolder(UUID folder)
         {
             // TODO: Deep voodoo here.  If you enable this code then
             // multi region breaks.  No idea why, but I figured it was
@@ -578,7 +578,7 @@ namespace OpenSim.Data.SQLite
         /// Delete an inventory item
         /// </summary>
         /// <param name="item">The item UUID</param>
-        public void deleteInventoryItem(LLUUID itemID)
+        public void deleteInventoryItem(UUID itemID)
         {
             lock (ds)
             {
@@ -599,7 +599,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="folderId">id of the folder, whose item content should be deleted</param>
         /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo>
-        private void deleteItemsInFolder(LLUUID folderId)
+        private void deleteItemsInFolder(UUID folderId)
         {
             List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId));
 
@@ -641,7 +641,7 @@ namespace OpenSim.Data.SQLite
         /// This will clean-up any child folders and child items as well
         /// </remarks>
         /// <param name="folderID">the folder UUID</param>
-        public void deleteInventoryFolder(LLUUID folderID)
+        public void deleteInventoryFolder(UUID folderID)
         {
             lock (ds)
             {
@@ -791,10 +791,10 @@ namespace OpenSim.Data.SQLite
         private static InventoryFolderBase buildFolder(DataRow row)
         {
             InventoryFolderBase folder = new InventoryFolderBase();
-            folder.ID = new LLUUID((string) row["UUID"]);
+            folder.ID = new UUID((string) row["UUID"]);
             folder.Name = (string) row["name"];
-            folder.Owner = new LLUUID((string) row["agentID"]);
-            folder.ParentID = new LLUUID((string) row["parentID"]);
+            folder.Owner = new UUID((string) row["agentID"]);
+            folder.ParentID = new UUID((string) row["parentID"]);
             folder.Type = Convert.ToInt16(row["type"]);
             folder.Version = Convert.ToUInt16(row["version"]);
             return folder;
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index 46c40e5..4a7e910 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 
 namespace OpenSim.Data.SQLite
@@ -118,7 +118,7 @@ namespace OpenSim.Data.SQLite
                 // Region Main
                 retval.regionHandle = (ulong) reader["regionHandle"];
                 retval.regionName = (string) reader["regionName"];
-                retval.UUID = new LLUUID((string) reader["uuid"]);
+                retval.UUID = new UUID((string) reader["uuid"]);
 
                 // Secrets
                 retval.regionRecvKey = (string) reader["regionRecvKey"];
@@ -182,7 +182,7 @@ namespace OpenSim.Data.SQLite
 
             parameters["regionHandle"] = profile.regionHandle.ToString();
             parameters["regionName"] = profile.regionName;
-            parameters["uuid"] = profile.UUID.ToString();
+            parameters["uuid"] = profile.ToString();
             parameters["regionRecvKey"] = profile.regionRecvKey;
             parameters["regionSendKey"] = profile.regionSendKey;
             parameters["regionDataURI"] = profile.regionDataURI;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index dd88751..bb441f6 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -31,7 +31,7 @@ using System.Data;
 using System.IO;
 using System.Reflection;
 using System.Threading;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
         {
         }
 
-        public RegionSettings LoadRegionSettings(LLUUID regionUUID)
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             return null;
         }
@@ -200,15 +200,15 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="obj">the object</param>
         /// <param name="regionUUID">the region UUID</param>
-        public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             lock (ds)
             {
                 foreach (SceneObjectPart prim in obj.Children.Values)
                 {
-                    if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0
-                        && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0
-                        && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0)
+                    if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
+                        && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
+                        && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
                     {
                         //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
                         addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
@@ -235,9 +235,9 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="obj">the object</param>
         /// <param name="regionUUID">the region UUID</param>
-        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
+        public void RemoveObject(UUID obj, UUID regionUUID)
         {
-            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
+            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
 
             DataTable prims = ds.Tables["prims"];
             DataTable shapes = ds.Tables["primshapes"];
@@ -249,7 +249,7 @@ namespace OpenSim.Data.SQLite
                 foreach (DataRow row in primRows)
                 {
                     // Remove shape rows
-                    LLUUID uuid = new LLUUID((string) row["UUID"]);
+                    UUID uuid = new UUID((string) row["UUID"]);
                     DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid));
                     if (shapeRow != null)
                     {
@@ -271,7 +271,7 @@ namespace OpenSim.Data.SQLite
         /// The caller must acquire the necessrary synchronization locks and commit or rollback changes.
         /// </summary>
         /// <param name="uuid">The item UUID</param>
-        private void RemoveItems(LLUUID uuid)
+        private void RemoveItems(UUID uuid)
         {
             DataTable items = ds.Tables["primitems"];
 
@@ -289,9 +289,9 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="regionUUID">The region UUID</param>
         /// <returns>List of loaded groups</returns>
-        public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
         {
-            Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>();
+            Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
 
             List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
 
@@ -350,7 +350,7 @@ namespace OpenSim.Data.SQLite
                                     "[REGION DB]: No shape found for prim in storage, so setting default box shape");
                                 prim.Shape = PrimitiveBaseShape.Default;
                             }
-                            createdObjects[new LLUUID(objID)].AddPart(prim);
+                            createdObjects[new UUID(objID)].AddPart(prim);
                         }
 
                             LoadItems(prim);
@@ -379,7 +379,7 @@ namespace OpenSim.Data.SQLite
 
             DataTable dbItems = ds.Tables["primitems"];
 
-            String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
+            String sql = String.Format("primID = '{0}'", prim.ToString());
             DataRow[] dbItemRows = dbItems.Select(sql);
 
             IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
@@ -407,7 +407,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="ter">terrain heightfield</param>
         /// <param name="regionID">region UUID</param>
-        public void StoreTerrain(double[,] ter, LLUUID regionID)
+        public void StoreTerrain(double[,] ter, UUID regionID)
         {
             lock (ds)
             {
@@ -451,7 +451,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="regionID">the region UUID</param>
         /// <returns>Heightfield data</returns>
-        public double[,] LoadTerrain(LLUUID regionID)
+        public double[,] LoadTerrain(UUID regionID)
         {
             lock (ds)
             {
@@ -499,7 +499,7 @@ namespace OpenSim.Data.SQLite
         ///
         /// </summary>
         /// <param name="globalID"></param>
-        public void RemoveLandObject(LLUUID globalID)
+        public void RemoveLandObject(UUID globalID)
         {
             lock (ds)
             {
@@ -563,7 +563,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="regionUUID"></param>
         /// <returns></returns>
-        public List<LandData> LoadLandObjects(LLUUID regionUUID)
+        public List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landDataForRegion = new List<LandData>();
             lock (ds)
@@ -821,12 +821,12 @@ namespace OpenSim.Data.SQLite
             createCol(land, "IsGroupOwned", typeof (Boolean));
             createCol(land, "Area", typeof (Int32));
             createCol(land, "AuctionID", typeof (Int32)); //Unemplemented
-            createCol(land, "Category", typeof (Int32)); //Enum libsecondlife.Parcel.ParcelCategory
+            createCol(land, "Category", typeof (Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory
             createCol(land, "ClaimDate", typeof (Int32));
             createCol(land, "ClaimPrice", typeof (Int32));
             createCol(land, "GroupUUID", typeof (string));
             createCol(land, "SalePrice", typeof (Int32));
-            createCol(land, "LandStatus", typeof (Int32)); //Enum. libsecondlife.Parcel.ParcelStatus
+            createCol(land, "LandStatus", typeof (Int32)); //Enum. OpenMetaverse.Parcel.ParcelStatus
             createCol(land, "LandFlags", typeof (UInt32));
             createCol(land, "LandingType", typeof (Byte));
             createCol(land, "MediaAutoScale", typeof (Byte));
@@ -882,7 +882,7 @@ namespace OpenSim.Data.SQLite
             // interesting has to be done to actually get these values
             // back out.  Not enough time to figure it out yet.
             SceneObjectPart prim = new SceneObjectPart();
-            prim.UUID = new LLUUID((String) row["UUID"]);
+            prim.UUID = new UUID((String) row["UUID"]);
             // explicit conversion of integers is required, which sort
             // of sucks.  No idea if there is a shortcut here or not.
             prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -895,43 +895,43 @@ namespace OpenSim.Data.SQLite
             prim.TouchName = (String) row["TouchName"];
             // permissions
             prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
-            prim.CreatorID = new LLUUID((String) row["CreatorID"]);
-            prim.OwnerID = new LLUUID((String) row["OwnerID"]);
-            prim.GroupID = new LLUUID((String) row["GroupID"]);
-            prim.LastOwnerID = new LLUUID((String) row["LastOwnerID"]);
+            prim.CreatorID = new UUID((String) row["CreatorID"]);
+            prim.OwnerID = new UUID((String) row["OwnerID"]);
+            prim.GroupID = new UUID((String) row["GroupID"]);
+            prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
             prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
             prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
             prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
             prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
             prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
             // vectors
-            prim.OffsetPosition = new LLVector3(
+            prim.OffsetPosition = new Vector3(
                 Convert.ToSingle(row["PositionX"]),
                 Convert.ToSingle(row["PositionY"]),
                 Convert.ToSingle(row["PositionZ"])
                 );
-            prim.GroupPosition = new LLVector3(
+            prim.GroupPosition = new Vector3(
                 Convert.ToSingle(row["GroupPositionX"]),
                 Convert.ToSingle(row["GroupPositionY"]),
                 Convert.ToSingle(row["GroupPositionZ"])
                 );
-            prim.Velocity = new LLVector3(
+            prim.Velocity = new Vector3(
                 Convert.ToSingle(row["VelocityX"]),
                 Convert.ToSingle(row["VelocityY"]),
                 Convert.ToSingle(row["VelocityZ"])
                 );
-            prim.AngularVelocity = new LLVector3(
+            prim.AngularVelocity = new Vector3(
                 Convert.ToSingle(row["AngularVelocityX"]),
                 Convert.ToSingle(row["AngularVelocityY"]),
                 Convert.ToSingle(row["AngularVelocityZ"])
                 );
-            prim.Acceleration = new LLVector3(
+            prim.Acceleration = new Vector3(
                 Convert.ToSingle(row["AccelerationX"]),
                 Convert.ToSingle(row["AccelerationY"]),
                 Convert.ToSingle(row["AccelerationZ"])
                 );
             // quaternions
-            prim.RotationOffset = new LLQuaternion(
+            prim.RotationOffset = new Quaternion(
                 Convert.ToSingle(row["RotationX"]),
                 Convert.ToSingle(row["RotationY"]),
                 Convert.ToSingle(row["RotationZ"]),
@@ -940,11 +940,11 @@ namespace OpenSim.Data.SQLite
 
             try
             {
-                prim.SitTargetPositionLL = new LLVector3(
+                prim.SitTargetPositionLL = new Vector3(
                                                          Convert.ToSingle(row["SitTargetOffsetX"]),
                                                          Convert.ToSingle(row["SitTargetOffsetY"]),
                                                          Convert.ToSingle(row["SitTargetOffsetZ"]));
-                prim.SitTargetOrientationLL = new LLQuaternion(
+                prim.SitTargetOrientationLL = new Quaternion(
                                                                Convert.ToSingle(
                                                                                 row["SitTargetOrientX"]),
                                                                Convert.ToSingle(
@@ -993,10 +993,10 @@ namespace OpenSim.Data.SQLite
         {
             TaskInventoryItem taskItem = new TaskInventoryItem();
 
-            taskItem.ItemID        = new LLUUID((String)row["itemID"]);
-            taskItem.ParentPartID  = new LLUUID((String)row["primID"]);
-            taskItem.AssetID       = new LLUUID((String)row["assetID"]);
-            taskItem.ParentID      = new LLUUID((String)row["parentFolderID"]);
+            taskItem.ItemID        = new UUID((String)row["itemID"]);
+            taskItem.ParentPartID  = new UUID((String)row["primID"]);
+            taskItem.AssetID       = new UUID((String)row["assetID"]);
+            taskItem.ParentID      = new UUID((String)row["parentFolderID"]);
 
             taskItem.InvType       = Convert.ToInt32(row["invType"]);
             taskItem.Type          = Convert.ToInt32(row["assetType"]);
@@ -1004,10 +1004,10 @@ namespace OpenSim.Data.SQLite
             taskItem.Name          = (String)row["name"];
             taskItem.Description   = (String)row["description"];
             taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
-            taskItem.CreatorID     = new LLUUID((String)row["creatorID"]);
-            taskItem.OwnerID       = new LLUUID((String)row["ownerID"]);
-            taskItem.LastOwnerID   = new LLUUID((String)row["lastOwnerID"]);
-            taskItem.GroupID       = new LLUUID((String)row["groupID"]);
+            taskItem.CreatorID     = new UUID((String)row["creatorID"]);
+            taskItem.OwnerID       = new UUID((String)row["ownerID"]);
+            taskItem.LastOwnerID   = new UUID((String)row["lastOwnerID"]);
+            taskItem.GroupID       = new UUID((String)row["groupID"]);
 
             taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
             taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
@@ -1028,7 +1028,7 @@ namespace OpenSim.Data.SQLite
         {
             LandData newData = new LandData();
 
-            newData.GlobalID = new LLUUID((String) row["UUID"]);
+            newData.GlobalID = new UUID((String) row["UUID"]);
             newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
 
             // Bitmap is a byte[512]
@@ -1041,17 +1041,17 @@ namespace OpenSim.Data.SQLite
             newData.Area = Convert.ToInt32(row["Area"]);
             newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
             newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]);
-                //Enum libsecondlife.Parcel.ParcelCategory
+                //Enum OpenMetaverse.Parcel.ParcelCategory
             newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
             newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
-            newData.GroupID = new LLUUID((String) row["GroupUUID"]);
+            newData.GroupID = new UUID((String) row["GroupUUID"]);
             newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
             newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]);
-                //Enum. libsecondlife.Parcel.ParcelStatus
+                //Enum. OpenMetaverse.Parcel.ParcelStatus
             newData.Flags = Convert.ToUInt32(row["LandFlags"]);
             newData.LandingType = (Byte) row["LandingType"];
             newData.MediaAutoScale = (Byte) row["MediaAutoScale"];
-            newData.MediaID = new LLUUID((String) row["MediaTextureUUID"]);
+            newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
             newData.MediaURL = (String) row["MediaURL"];
             newData.MusicURL = (String) row["MusicURL"];
             newData.PassHours = Convert.ToSingle(row["PassHours"]);
@@ -1061,25 +1061,25 @@ namespace OpenSim.Data.SQLite
             {
 
                 newData.UserLocation =
-                    new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
+                    new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
                                   Convert.ToSingle(row["UserLocationZ"]));
                 newData.UserLookAt =
-                    new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
+                    new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
                                   Convert.ToSingle(row["UserLookAtZ"]));
 
             }
             catch (InvalidCastException)
             {
                 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
-                newData.UserLocation = LLVector3.Zero;
-                newData.UserLookAt = LLVector3.Zero;
+                newData.UserLocation = Vector3.Zero;
+                newData.UserLookAt = Vector3.Zero;
             }
             newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
-            LLUUID authBuyerID = LLUUID.Zero;
+            UUID authBuyerID = UUID.Zero;
 
             try
             {
-                Helpers.TryParse((string)row["AuthbuyerID"], out authBuyerID);
+                UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
             }
             catch (InvalidCastException)
             {
@@ -1120,7 +1120,7 @@ namespace OpenSim.Data.SQLite
         private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
         {
             ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-            entry.AgentID = new LLUUID((string) row["AccessUUID"]);
+            entry.AgentID = new UUID((string) row["AccessUUID"]);
             entry.Flags = (ParcelManager.AccessList) row["Flags"];
             entry.Time = new DateTime();
             return entry;
@@ -1144,7 +1144,7 @@ namespace OpenSim.Data.SQLite
             return str.ToArray();
         }
 
-//         private void fillTerrainRow(DataRow row, LLUUID regionUUID, int rev, double[,] val)
+//         private void fillTerrainRow(DataRow row, UUID regionUUID, int rev, double[,] val)
 //         {
 //             row["RegionUUID"] = regionUUID;
 //             row["Revision"] = rev;
@@ -1167,7 +1167,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="prim"></param>
         /// <param name="sceneGroupID"></param>
         /// <param name="regionUUID"></param>
-        private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
+        private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
         {
             row["UUID"] = Util.ToRawUuidString(prim.UUID);
             row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1215,12 +1215,12 @@ namespace OpenSim.Data.SQLite
             row["RotationW"] = prim.RotationOffset.W;
 
             // Sit target
-            LLVector3 sitTargetPos = prim.SitTargetPositionLL;
+            Vector3 sitTargetPos = prim.SitTargetPositionLL;
             row["SitTargetOffsetX"] = sitTargetPos.X;
             row["SitTargetOffsetY"] = sitTargetPos.Y;
             row["SitTargetOffsetZ"] = sitTargetPos.Z;
 
-            LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
+            Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
             row["SitTargetOrientW"] = sitTargetOrient.W;
             row["SitTargetOrientX"] = sitTargetOrient.X;
             row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1263,7 +1263,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="row"></param>
         /// <param name="land"></param>
         /// <param name="regionUUID"></param>
-        private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID)
+        private static void fillLandRow(DataRow row, LandData land, UUID regionUUID)
         {
             row["UUID"] = Util.ToRawUuidString(land.GlobalID);
             row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1278,12 +1278,12 @@ namespace OpenSim.Data.SQLite
             row["IsGroupOwned"] = land.IsGroupOwned;
             row["Area"] = land.Area;
             row["AuctionID"] = land.AuctionID; //Unemplemented
-            row["Category"] = land.Category; //Enum libsecondlife.Parcel.ParcelCategory
+            row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory
             row["ClaimDate"] = land.ClaimDate;
             row["ClaimPrice"] = land.ClaimPrice;
             row["GroupUUID"] = Util.ToRawUuidString(land.GroupID);
             row["SalePrice"] = land.SalePrice;
-            row["LandStatus"] = land.Status; //Enum. libsecondlife.Parcel.ParcelStatus
+            row["LandStatus"] = land.Status; //Enum. OpenMetaverse.Parcel.ParcelStatus
             row["LandFlags"] = land.Flags;
             row["LandingType"] = land.LandingType;
             row["MediaAutoScale"] = land.MediaAutoScale;
@@ -1308,7 +1308,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="row"></param>
         /// <param name="entry"></param>
         /// <param name="parcelID"></param>
-        private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID)
+        private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
         {
             row["LandUUID"] = Util.ToRawUuidString(parcelID);
             row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID);
@@ -1323,7 +1323,7 @@ namespace OpenSim.Data.SQLite
         private PrimitiveBaseShape buildShape(DataRow row)
         {
             PrimitiveBaseShape s = new PrimitiveBaseShape();
-            s.Scale = new LLVector3(
+            s.Scale = new Vector3(
                 Convert.ToSingle(row["ScaleX"]),
                 Convert.ToSingle(row["ScaleY"]),
                 Convert.ToSingle(row["ScaleZ"])
@@ -1418,7 +1418,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="prim"></param>
         /// <param name="sceneGroupID"></param>
         /// <param name="regionUUID"></param>
-        private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
+        private void addPrim(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
         {
             DataTable prims = ds.Tables["prims"];
             DataTable shapes = ds.Tables["primshapes"];
@@ -1453,7 +1453,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="primID"></param>
         /// <param name="items"></param>
-        public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items)
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
 
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index ae3cb72..7f1fd62 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
@@ -59,7 +59,7 @@ namespace OpenSim.Data.SQLite
         private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
         private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
 
-        private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>();
+        private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
         private DataSet ds;
         private SqliteDataAdapter da;
         private SqliteDataAdapter daf;
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="uuid">User UUID</param>
         /// <returns>user profile data</returns>
-        override public UserProfileData GetUserByUUID(LLUUID uuid)
+        override public UserProfileData GetUserByUUID(UUID uuid)
         {
             lock (ds)
             {
@@ -184,21 +184,21 @@ namespace OpenSim.Data.SQLite
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <param name="friend">UUID of the friend to add</param>
         /// <param name="perms">permission flag</param>
-        override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
+        override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
         {
             string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)";
 
             using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
                 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
                 cmd.ExecuteNonQuery();
             }
             using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.UUID.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.ToString()));
                 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
                 cmd.ExecuteNonQuery();
             }
@@ -209,13 +209,13 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <param name="friend">UUID of the friend to remove</param>
-        override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
+        override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
         {
             string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
             using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
                 cmd.ExecuteNonQuery();
             }
         }
@@ -226,14 +226,14 @@ namespace OpenSim.Data.SQLite
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <param name="friend">UUID of the friend to modify</param>
         /// <param name="perms">updated permission flag</param>
-        override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
+        override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
         {
             string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID";
             using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn))
             {
                 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
                 cmd.ExecuteNonQuery();
             }
         }
@@ -243,13 +243,13 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="friendlistowner">UUID of the friendlist owner</param>
         /// <returns>The friendlist list</returns>
-        override public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
+        override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
         {
             List<FriendListItem> returnlist = new List<FriendListItem>();
 
             using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
 
                 try
                 {
@@ -259,7 +259,7 @@ namespace OpenSim.Data.SQLite
                         {
                             FriendListItem user = new FriendListItem();
                             user.FriendListOwner = friendlistowner;
-                            user.Friend = new LLUUID((string)reader[0]);
+                            user.Friend = new UUID((string)reader[0]);
                             user.FriendPerms = Convert.ToUInt32(reader[1]);
                             user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]);
                             returnlist.Add(user);
@@ -288,7 +288,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="regionuuid">UUID of the region</param>
         /// <param name="regionhandle">region handle</param>
         /// <remarks>DO NOTHING</remarks>
-        override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
+        override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
         {
             //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
         }
@@ -299,7 +299,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="queryID"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
         {
             List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
             string[] querysplit;
@@ -316,7 +316,7 @@ namespace OpenSim.Data.SQLite
                         while (reader.Read())
                         {
                             AvatarPickerAvatar user = new AvatarPickerAvatar();
-                            user.AvatarID = new LLUUID((string) reader["UUID"]);
+                            user.AvatarID = new UUID((string) reader["UUID"]);
                             user.firstName = (string) reader["username"];
                             user.lastName = (string) reader["surname"];
                             returnlist.Add(user);
@@ -337,7 +337,7 @@ namespace OpenSim.Data.SQLite
                         while (reader.Read())
                         {
                             AvatarPickerAvatar user = new AvatarPickerAvatar();
-                            user.AvatarID = new LLUUID((string) reader["UUID"]);
+                            user.AvatarID = new UUID((string) reader["UUID"]);
                             user.firstName = (string) reader["username"];
                             user.lastName = (string) reader["surname"];
                             returnlist.Add(user);
@@ -354,7 +354,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="uuid">The user's account ID</param>
         /// <returns>A matching user profile</returns>
-        override public UserAgentData GetAgentByUUID(LLUUID uuid)
+        override public UserAgentData GetAgentByUUID(UUID uuid)
         {
             try
             {
@@ -399,7 +399,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="AgentID">UUID of the user</param>
         /// <param name="WebLoginKey">UUID of the weblogin</param>
-        override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
+        override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
         {
             DataTable users = ds.Tables["users"];
             lock (ds)
@@ -520,7 +520,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="to">End account</param>
         /// <param name="amount">The amount to move</param>
         /// <returns>Success?</returns>
-        override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount)
+        override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
         {
             return true;
         }
@@ -533,7 +533,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="to">Receivers account</param>
         /// <param name="item">Inventory item</param>
         /// <returns>Success?</returns>
-        override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
+        override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
         {
             return true;
         }
@@ -545,7 +545,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="user">The user UUID</param>
         /// <returns>Avatar Appearence</returns>
-        override public AvatarAppearance GetUserAppearance(LLUUID user)
+        override public AvatarAppearance GetUserAppearance(UUID user)
         {
             AvatarAppearance aa = null;
             try {
@@ -562,7 +562,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="user">the user UUID</param>
         /// <param name="appearance">appearence</param>
-        override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
+        override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
         {
             appearance.Owner = user;
             aplist[user] = appearance;
@@ -707,8 +707,8 @@ namespace OpenSim.Data.SQLite
         private static UserProfileData buildUserProfile(DataRow row)
         {
             UserProfileData user = new UserProfileData();
-            LLUUID tmp;
-            LLUUID.TryParse((String)row["UUID"], out tmp);
+            UUID tmp;
+            UUID.TryParse((String)row["UUID"], out tmp);
             user.ID = tmp;
             user.FirstName = (String) row["username"];
             user.SurName = (String) row["surname"];
@@ -717,39 +717,39 @@ namespace OpenSim.Data.SQLite
 
             user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]);
             user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]);
-            user.HomeLocation = new LLVector3(
+            user.HomeLocation = new Vector3(
                 Convert.ToSingle(row["homeLocationX"]),
                 Convert.ToSingle(row["homeLocationY"]),
                 Convert.ToSingle(row["homeLocationZ"])
                 );
-            user.HomeLookAt = new LLVector3(
+            user.HomeLookAt = new Vector3(
                 Convert.ToSingle(row["homeLookAtX"]),
                 Convert.ToSingle(row["homeLookAtY"]),
                 Convert.ToSingle(row["homeLookAtZ"])
                 );
 
-            LLUUID regionID = LLUUID.Zero;
-            LLUUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero
+            UUID regionID = UUID.Zero;
+            UUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
             user.HomeRegionID = regionID;
 
             user.Created = Convert.ToInt32(row["created"]);
             user.LastLogin = Convert.ToInt32(row["lastLogin"]);
-            user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]);
+            user.RootInventoryFolderID = new UUID((String) row["rootInventoryFolderID"]);
             user.UserInventoryURI = (String) row["userInventoryURI"];
             user.UserAssetURI = (String) row["userAssetURI"];
             user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
             user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
             user.AboutText = (String) row["profileAboutText"];
             user.FirstLifeAboutText = (String) row["profileFirstText"];
-            LLUUID.TryParse((String)row["profileImage"], out tmp);
+            UUID.TryParse((String)row["profileImage"], out tmp);
             user.Image = tmp;
-            LLUUID.TryParse((String)row["profileFirstImage"], out tmp);
+            UUID.TryParse((String)row["profileFirstImage"], out tmp);
             user.FirstLifeImage = tmp;
-            user.WebLoginKey = new LLUUID((String) row["webLoginKey"]);
+            user.WebLoginKey = new UUID((String) row["webLoginKey"]);
             user.UserFlags = Convert.ToInt32(row["userFlags"]);
             user.GodLevel = Convert.ToInt32(row["godLevel"]);
             user.CustomType = row["customType"].ToString();
-            user.Partner = new LLUUID((String) row["partner"]);
+            user.Partner = new UUID((String) row["partner"]);
 
             return user;
         }
@@ -814,18 +814,18 @@ namespace OpenSim.Data.SQLite
         {
             UserAgentData ua = new UserAgentData();
 
-            ua.ProfileID = new LLUUID((String) row["UUID"]);
+            ua.ProfileID = new UUID((String) row["UUID"]);
             ua.AgentIP = (String) row["agentIP"];
             ua.AgentPort = Convert.ToUInt32(row["agentPort"]);
             ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]);
-            ua.SessionID = new LLUUID((String) row["sessionID"]);
-            ua.SecureSessionID = new LLUUID((String) row["secureSessionID"]);
-            ua.InitialRegion = new LLUUID((String) row["regionID"]);
+            ua.SessionID = new UUID((String) row["sessionID"]);
+            ua.SecureSessionID = new UUID((String) row["secureSessionID"]);
+            ua.InitialRegion = new UUID((String) row["regionID"]);
             ua.LoginTime = Convert.ToInt32(row["loginTime"]);
             ua.LogoutTime = Convert.ToInt32(row["logoutTime"]);
-            ua.Region = new LLUUID((String) row["currentRegion"]);
+            ua.Region = new UUID((String) row["currentRegion"]);
             ua.Handle = Convert.ToUInt64(row["currentHandle"]);
-            ua.Position = new LLVector3(
+            ua.Position = new Vector3(
                 Convert.ToSingle(row["currentPosX"]),
                 Convert.ToSingle(row["currentPosY"]),
                 Convert.ToSingle(row["currentPosZ"])
@@ -906,7 +906,7 @@ namespace OpenSim.Data.SQLite
 
         }
 
-        override public void ResetAttachments(LLUUID userID)
+        override public void ResetAttachments(UUID userID)
         {
         }
     }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index e57c8f8..33b8a94 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -27,7 +27,7 @@
 
 using System.Reflection;
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 
@@ -37,28 +37,28 @@ namespace OpenSim.Data
     {
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        // private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>();
+        // private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
 
-        public abstract UserProfileData GetUserByUUID(LLUUID user);
+        public abstract UserProfileData GetUserByUUID(UUID user);
         public abstract UserProfileData GetUserByName(string fname, string lname);
-        public abstract UserAgentData GetAgentByUUID(LLUUID user);
+        public abstract UserAgentData GetAgentByUUID(UUID user);
         public abstract UserAgentData GetAgentByName(string name);
         public abstract UserAgentData GetAgentByName(string fname, string lname);
-        public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey);
+        public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
         public abstract void AddNewUserProfile(UserProfileData user);
         public abstract bool UpdateUserProfile(UserProfileData user);
-        public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle);
+        public abstract void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
         public abstract void AddNewUserAgent(UserAgentData agent);
-        public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms);
-        public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend);
-        public abstract void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms);
-        public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
-        public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
-        public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
-        public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
-        public abstract AvatarAppearance GetUserAppearance(LLUUID user);
-        public abstract void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
-        // public virtual AvatarAppearance GetUserAppearance(LLUUID user) {
+        public abstract void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
+        public abstract void RemoveUserFriend(UUID friendlistowner, UUID friend);
+        public abstract void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
+        public abstract List<FriendListItem> GetUserFriendList(UUID friendlistowner);
+        public abstract bool MoneyTransferRequest(UUID from, UUID to, uint amount);
+        public abstract bool InventoryTransferRequest(UUID from, UUID to, UUID inventory);
+        public abstract List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query);
+        public abstract AvatarAppearance GetUserAppearance(UUID user);
+        public abstract void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
+        // public virtual AvatarAppearance GetUserAppearance(UUID user) {
         //     AvatarAppearance aa = null;
         //     try {
         //         aa = aplist[user];
@@ -68,11 +68,11 @@ namespace OpenSim.Data
         //     }
         //     return aa;
         // }
-        // public virtual void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) {
+        // public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance) {
         //     aplist[user] = appearance;
         //     m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString());
         // }
-        public abstract void ResetAttachments(LLUUID userID);
+        public abstract void ResetAttachments(UUID userID);
 
         public abstract string Version {get;}
         public abstract string Name {get;}