4 files changed, 25 insertions, 25 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index a2c3c2c..aabddc6 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -177,7 +177,7 @@ namespace OpenSim.Region.Communications.Local
             return null;
         }
 
-        public RegionInfo RequestNeighbourInfo(LLUUID regionID)
+        public RegionInfo RequestNeighbourInfo(UUID regionID)
         {
             // TODO add a dictionary for faster lookup
             foreach (RegionInfo info in m_regions.Values)
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Communications.Local
             return mapBlocks;
         }
 
-        public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
+        public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
+        public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -338,7 +338,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
+        public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -355,7 +355,7 @@ namespace OpenSim.Region.Communications.Local
         /// <param name="agentID"></param>
         /// <param name="position"></param>
         /// <returns></returns>
-        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
+        public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -366,7 +366,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
+        public bool ExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
+        public bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -385,7 +385,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID)
+        public bool AcknowledgePrimCrossed(ulong regionHandle, UUID primID)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -430,7 +430,7 @@ namespace OpenSim.Region.Communications.Local
             }
         }
 
-        public void TriggerLogOffUser(ulong regionHandle, LLUUID agentID, LLUUID RegionSecret, string message)
+        public void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Communications.Local
             }
         }
 
-        public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
+        public void TriggerExpectPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -461,7 +461,7 @@ namespace OpenSim.Region.Communications.Local
             }
         }
 
-        public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
+        public bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
+        public bool TriggerExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 1d8ea53..5cb33cc 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Communications.Local
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
+        public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback)
         {
             m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID);
 
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Communications.Local
             // Need to retrieve the root folder on the first pass
             foreach (InventoryFolderBase folder in skeletonFolders)
             {
-                if (folder.ParentID == LLUUID.Zero)
+                if (folder.ParentID == UUID.Zero)
                 {
                     rootFolder = new InventoryFolderImpl(folder);
                     folders.Add(rootFolder);
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
             callback(folders, items);
         }
 
-        public override bool HasInventoryForUser(LLUUID userID)
+        public override bool HasInventoryForUser(UUID userID)
         {
             InventoryFolderBase root = RequestRootFolder(userID);
             if (root == null)
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index aeb9ae0..518ba09 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -246,9 +246,9 @@ namespace OpenSim.Region.Communications.Local
                 _login.SecureSession = response.SecureSessionID;
                 _login.CircuitCode = (uint) response.CircuitCode;
                 if (specificStartLocation)
-                    _login.StartPos = new LLVector3(locX, locY, locZ);
+                    _login.StartPos = new Vector3(locX, locY, locZ);
                 else
-                    _login.StartPos = new LLVector3(128, 128, 128);
+                    _login.StartPos = new Vector3(128, 128, 128);
                 _login.CapsPath = capsPath;
 
                 m_log.InfoFormat(
@@ -282,7 +282,7 @@ namespace OpenSim.Region.Communications.Local
         }
 
         // See LoginService
-        protected override InventoryData GetInventorySkeleton(LLUUID userID)
+        protected override InventoryData GetInventorySkeleton(UUID userID)
         {
             List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
 
@@ -293,12 +293,12 @@ namespace OpenSim.Region.Communications.Local
                 folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
             }
 
-            LLUUID rootID = LLUUID.Zero;
+            UUID rootID = UUID.Zero;
             ArrayList AgentInventoryArray = new ArrayList();
             Hashtable TempHash;
             foreach (InventoryFolderBase InvFolder in folders)
             {
-                if (InvFolder.ParentID == LLUUID.Zero)
+                if (InvFolder.ParentID == UUID.Zero)
                 {
                     rootID = InvFolder.ID;
                 }
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 2ee7981..c0887df 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -26,7 +26,7 @@
  */
 
 using System;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
             return profile;
         }
 
-        public override UserProfileData SetupMasterUser(LLUUID uuid)
+        public override UserProfileData SetupMasterUser(UUID uuid)
         {
             UserProfileData data = GetUserProfile(uuid);
             if (data == null)