14 files changed, 70 insertions, 70 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
index c099fa1..90d1c12 100644
--- a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs
@@ -25,20 +25,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IAgentAssetTransactions
     {
-        void HandleItemUpdateFromTransaction(IClientAPI remoteClient, LLUUID transactionID,
+        void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID,
                                              InventoryItemBase item);
 
-        void HandleItemCreationFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID,
+        void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID,
                                                uint callbackID, string description, string name, sbyte invType,
                                                sbyte type, byte wearableType, uint nextOwnerMask);
 
-        void RemoveAgentAssetTransactions(LLUUID userID);
+        void RemoveAgentAssetTransactions(UUID userID);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
index d03e167..a722833 100644
--- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
 
@@ -33,7 +33,7 @@ namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IAvatarFactory
     {
-        bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance);
-        void UpdateDatabase(LLUUID userID, AvatarAppearance avatAppearance);
+        bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance);
+        void UpdateDatabase(UUID userID, AvatarAppearance avatAppearance);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
index aeb47e1..c54c697 100644
--- a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
+++ b/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs
@@ -26,22 +26,22 @@
  */
 
 using System.IO;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IDynamicTextureManager
     {
         void RegisterRender(string handleType, IDynamicTextureRender render);
-        void ReturnData(LLUUID id, byte[] data);
+        void ReturnData(UUID id, byte[] data);
 
-        LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams,
+        UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
                                     int updateTimer);
-        LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams,
+        UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams,
                                    int updateTimer, bool SetBlending, byte AlphaValue);
-        LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data, string extraParams,
+        UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams,
                                      int updateTimer);
-        LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data, string extraParams,
+        UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams,
                                     int updateTimer, bool SetBlending, byte AlphaValue);
     }
 
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Interfaces
         bool SupportsAsynchronous();
         byte[] ConvertUrl(string url, string extraParams);
         byte[] ConvertStream(Stream data, string extraParams);
-        bool AsyncConvertUrl(LLUUID id, string url, string extraParams);
-        bool AsyncConvertData(LLUUID id, string bodyData, string extraParams);
+        bool AsyncConvertUrl(UUID id, string url, string extraParams);
+        bool AsyncConvertData(UUID id, string bodyData, string extraParams);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs b/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
index 3726ba5..5f1bcf3 100644
--- a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEmailModule.cs
@@ -27,7 +27,7 @@
 
 using System;
 using OpenSim.Framework;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Interfaces
 
     public interface IEmailModule : IRegionModule
     {
-        void SendEmail(LLUUID objectID, string address, string subject, string body);
-        Email GetNextEmail(LLUUID objectID, string sender, string subject);
+        void SendEmail(UUID objectID, string address, string subject, string body);
+        Email GetNextEmail(UUID objectID, string sender, string subject);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
index ecac2ca..f2d14a6 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs
@@ -27,7 +27,7 @@
 
 using System;
 using OpenSim.Framework;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Interfaces
     {
         void Initialise(string connectstring);
 
-        EstateSettings LoadEstateSettings(LLUUID regionID);
+        EstateSettings LoadEstateSettings(UUID regionID);
         void StoreEstateSettings(EstateSettings es);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
index bfe3591..70c5800 100644
--- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs
@@ -27,13 +27,13 @@
 
 using System;
 using OpenSim.Framework;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IEstateModule : IRegionModule
     {
         uint GetRegionFlags();
-        bool IsManager(LLUUID avatarID);
+        bool IsManager(UUID avatarID);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
index 3a635de..216782b 100644
--- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
@@ -26,17 +26,17 @@
  */
 
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IHttpRequests
     {
-        LLUUID MakeHttpRequest(string url, string parameters, string body);
-        LLUUID StartHttpRequest(uint localID, LLUUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
-        void StopHttpRequest(uint m_localID, LLUUID m_itemID);
+        UUID MakeHttpRequest(string url, string parameters, string body);
+        UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
+        void StopHttpRequest(uint m_localID, UUID m_itemID);
         HttpRequestClass GetNextCompletedRequest();
-        void RemoveCompletedRequest(LLUUID id);
+        void RemoveCompletedRequest(UUID id);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs b/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs
index c93694a9..50f4af3 100644
--- a/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs
@@ -26,7 +26,7 @@
  */
 
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
     /// </summary>
     public interface IInventoryModule
     {
-        void SetRootAgentScene(LLUUID agentID, Scene scene);
-        bool NeedSceneCacheClear(LLUUID agentID, Scene scene);
+        void SetRootAgentScene(UUID agentID, Scene scene);
+        bool NeedSceneCacheClear(UUID agentID, Scene scene);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
index c1f6f45..4a74949 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
@@ -26,7 +26,7 @@
  */
 
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
 
@@ -35,13 +35,13 @@ namespace OpenSim.Region.Environment.Interfaces
     public interface ILandChannel
     {
 
-        List<ILandObject> ParcelsNearPoint(LLVector3 position);
+        List<ILandObject> ParcelsNearPoint(Vector3 position);
         ILandObject GetLandObject(int x, int y);
         ILandObject GetLandObject(float x, float y);
         bool IsLandPrimCountTainted();
         bool IsForcefulBansAllowed();
         void UpdateLandObject(int localID, LandData data);
-        void ReturnObjectsInParcel(int localID, uint returnType, LLUUID[] agentIDs, LLUUID[] taskIDs, IClientAPI remoteClient);
+        void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient);
         void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
         void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
     }
diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
index 750b387..96fa378 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
@@ -26,7 +26,7 @@
  */
 
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
 
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Interfaces
 
         LandData landData { get; set; }
         bool[,] landBitmap { get; set; }
-        LLUUID regionUUID { get; }
+        UUID regionUUID { get; }
         bool containsPoint(int x, int y);
         ILandObject Copy();
 
@@ -50,12 +50,12 @@ namespace OpenSim.Region.Environment.Interfaces
 
         void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client);
         void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
-        bool isEitherBannedOrRestricted(LLUUID avatar);
-        bool isBannedFromLand(LLUUID avatar);
-        bool isRestrictedFromLand(LLUUID avatar);
+        bool isEitherBannedOrRestricted(UUID avatar);
+        bool isBannedFromLand(UUID avatar);
+        bool isRestrictedFromLand(UUID avatar);
         void sendLandUpdateToClient(IClientAPI remote_client);
-        List<LLUUID> createAccessListArrayByFlag(ParcelManager.AccessList flag);
-        void sendAccessList(LLUUID agentID, LLUUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
+        List<UUID> createAccessListArrayByFlag(ParcelManager.AccessList flag);
+        void sendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
         void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
         void updateLandBitmapByteArray();
         void setLandBitmapFromByteArray();
@@ -71,11 +71,11 @@ namespace OpenSim.Region.Environment.Interfaces
         void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client);
         void sendLandObjectOwners(IClientAPI remote_client);
         void returnObject(SceneObjectGroup obj);
-        void returnLandObjects(uint type, LLUUID[] owners, IClientAPI remote_client);
+        void returnLandObjects(uint type, UUID[] owners, IClientAPI remote_client);
         void resetLandPrimCounts();
         void addPrimToCount(SceneObjectGroup obj);
         void removePrimFromCount(SceneObjectGroup obj);
-        void updateLandSold(LLUUID avatarID, LLUUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area);
+        void updateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area);
 
         void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
         void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index 4e716a2..5f10ec5 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -26,7 +26,7 @@
  */
 
 using System.Collections.Generic;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
 
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Environment.Interfaces
         /// </summary>
         /// <param name="obj"></param>
         /// <param name="regionUUID"></param>
-        void StoreObject(SceneObjectGroup obj, LLUUID regionUUID);
+        void StoreObject(SceneObjectGroup obj, UUID regionUUID);
 
         /// <summary>
         /// Entirely removes the object, including inventory
@@ -54,25 +54,25 @@ namespace OpenSim.Region.Environment.Interfaces
         /// <param name="uuid"></param>
         /// <param name="regionUUID"></param>
         /// <returns></returns>
-        void RemoveObject(LLUUID uuid, LLUUID regionUUID);
+        void RemoveObject(UUID uuid, UUID regionUUID);
 
         /// <summary>
         /// Store a prim's inventory
         /// </summary>
         /// <returns></returns>
-        void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items);
+        void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items);
 
-        List<SceneObjectGroup> LoadObjects(LLUUID regionUUID);
+        List<SceneObjectGroup> LoadObjects(UUID regionUUID);
 
-        void StoreTerrain(double[,] terrain, LLUUID regionID);
-        double[,] LoadTerrain(LLUUID regionID);
+        void StoreTerrain(double[,] terrain, UUID regionID);
+        double[,] LoadTerrain(UUID regionID);
 
         void StoreLandObject(ILandObject Parcel);
-        void RemoveLandObject(LLUUID globalID);
-        List<LandData> LoadLandObjects(LLUUID regionUUID);
+        void RemoveLandObject(UUID globalID);
+        List<LandData> LoadLandObjects(UUID regionUUID);
 
         void StoreRegionSettings(RegionSettings rs);
-        RegionSettings LoadRegionSettings(LLUUID regionUUID);
+        RegionSettings LoadRegionSettings(UUID regionUUID);
 
         void Shutdown();
     }
diff --git a/OpenSim/Region/Environment/Interfaces/IScriptModule.cs b/OpenSim/Region/Environment/Interfaces/IScriptModule.cs
index 8d3868e..efe7944 100644
--- a/OpenSim/Region/Environment/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IScriptModule.cs
@@ -27,12 +27,12 @@
 
 using System;
 using OpenSim.Framework;
-using libsecondlife;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IScriptModule : IRegionModule
     {
-        bool GetScriptRunning(LLUUID objectID, LLUUID itemID);
+        bool GetScriptRunning(UUID objectID, UUID itemID);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
index c2a55eb..1a33450 100644
--- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
@@ -26,7 +26,7 @@
  */
 
 using System;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
 
@@ -34,15 +34,15 @@ namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IWorldComm
     {
-        int Listen(uint LocalID, LLUUID itemID, LLUUID hostID, int channel, string name, LLUUID id, string msg);
-        void DeliverMessage(ChatTypeEnum type, int channel, string name, LLUUID id, string msg);
+        int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg);
+        void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg);
         bool HasMessages();
         ListenerInfo GetNextMessage();
-        void ListenControl(LLUUID itemID, int handle, int active);
-        void ListenRemove(LLUUID itemID, int handle);
-        void DeleteListener(LLUUID itemID);
-        Object[] GetSerializationData(LLUUID itemID);
-        void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID,
+        void ListenControl(UUID itemID, int handle, int active);
+        void ListenRemove(UUID itemID, int handle);
+        void DeleteListener(UUID itemID);
+        Object[] GetSerializationData(UUID itemID);
+        void CreateFromData(uint localID, UUID itemID, UUID hostID,
                         Object[] data);
     }
 }
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
index a2c164f..88e9ab5 100644
--- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
@@ -25,24 +25,24 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
 
 namespace OpenSim.Region.Environment.Interfaces
 {
     public interface IXMLRPC
     {
-        LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID, LLUUID channelID);
-        void CloseXMLRPCChannel(LLUUID channelKey);
+        UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID);
+        void CloseXMLRPCChannel(UUID channelKey);
         bool hasRequests();
         void RemoteDataReply(string channel, string message_id, string sdata, int idata);
         bool IsEnabled();
         RPCRequestInfo GetNextCompletedRequest();
-        void RemoveCompletedRequest(LLUUID id);
-        void DeleteChannels(LLUUID itemID);
-        LLUUID SendRemoteData(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata);
+        void RemoveCompletedRequest(UUID id);
+        void DeleteChannels(UUID itemID);
+        UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata);
         SendRemoteDataRequest GetNextCompletedSRDRequest();
-        void RemoveCompletedSRDRequest(LLUUID id);
-        void CancelSRDRequests(LLUUID itemID);
+        void RemoveCompletedSRDRequest(UUID id);
+        void CancelSRDRequests(UUID itemID);
     }
 }