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

---
 .../Agent/AssetDownload/AssetDownloadModule.cs     | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
index d3cf41e..3b521c3 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
@@ -26,8 +26,8 @@
  */
 
 using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -43,16 +43,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
         private List<AssetRequest> AssetRequests;
 
         private Scene m_scene;
-        private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>();
+        private Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>();
 
         ///
         /// Assets requests (for each user) which are waiting for asset server data.  This includes texture requests
         /// </summary>
-        private Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> RequestedAssets;
+        private Dictionary<UUID, Dictionary<UUID, AssetRequest>> RequestedAssets;
 
         public AssetDownloadModule()
         {
-            RequestedAssets = new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>();
+            RequestedAssets = new Dictionary<UUID, Dictionary<UUID, AssetRequest>>();
             AssetRequests = new List<AssetRequest>();
         }
 
@@ -109,24 +109,24 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
         /// <param name="transferRequest"></param>
         public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
         {
-            LLUUID requestID = null;
+            UUID requestID = null;
             byte source = 2;
             if (transferRequest.TransferInfo.SourceType == 2)
             {
                 //direct asset request
-                requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);
+                requestID = new UUID(transferRequest.TransferInfo.Params, 0);
             }
             else if (transferRequest.TransferInfo.SourceType == 3)
             {
                 //inventory asset request
-                requestID = new LLUUID(transferRequest.TransferInfo.Params, 80);
+                requestID = new UUID(transferRequest.TransferInfo.Params, 80);
                 source = 3;
                 //Console.WriteLine("asset request " + requestID);
             }
 
             //not found asset
             // so request from asset server
-            Dictionary<LLUUID, AssetRequest> userRequests = null;
+            Dictionary<UUID, AssetRequest> userRequests = null;
             if (RequestedAssets.TryGetValue(userInfo.AgentId, out userRequests))
             {
                 if (!userRequests.ContainsKey(requestID))
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
             }
             else
             {
-                userRequests = new Dictionary<LLUUID, AssetRequest>();
+                userRequests = new Dictionary<UUID, AssetRequest>();
                 AssetRequest request = new AssetRequest();
                 request.RequestUser = userInfo;
                 request.RequestAssetID = requestID;
@@ -156,11 +156,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
             }
         }
 
-        public void AssetCallback(LLUUID assetID, AssetBase asset)
+        public void AssetCallback(UUID assetID, AssetBase asset)
         {
             if (asset != null)
             {
-                foreach (Dictionary<LLUUID, AssetRequest> userRequests in RequestedAssets.Values)
+                foreach (Dictionary<UUID, AssetRequest> userRequests in RequestedAssets.Values)
                 {
                     if (userRequests.ContainsKey(assetID))
                     {
@@ -212,9 +212,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
             public int NumPackets = 0;
             public int PacketCounter = 0;
             public byte[] Params = null;
-            public LLUUID RequestAssetID;
+            public UUID RequestAssetID;
             public IClientAPI RequestUser;
-            public LLUUID TransferRequestID;
+            public UUID TransferRequestID;
             //public bool AssetInCache;
             //public int TimeRequested;
 
@@ -225,4 +225,4 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
 
         #endregion
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1