Started the process of cleaning up AssetCache and moving most of the code into modules. Have moved TextureRequest handling (from the client) to a module. But even though to start with I just did a little bit of cleaning up of the existing code, it doesn't seem to work as good as the old code so I need to spend more time on it. So for now am committing my changes but with them not in use. So for now all Texture and asset requests are still handled by the old code in AssetCache.

1 files changed, 28 insertions, 0 deletions

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 7cb18e5..8aae3c2 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -136,6 +136,33 @@ namespace OpenSim.Framework.Interfaces
         }
     }
 
+    public class TextureRequestArgs : EventArgs
+    {
+        protected LLUUID m_requestedAssetID;
+        private sbyte m_discardLevel;
+        private uint m_packetNumber;
+
+        public uint PacketNumber
+        {
+            get { return m_packetNumber; }
+            set { m_packetNumber = value; }
+        }
+
+        public sbyte DiscardLevel
+        {
+            get { return m_discardLevel; }
+            set { m_discardLevel = value; }
+        }
+
+        public LLUUID RequestedAssetID
+        {
+            get { return m_requestedAssetID; }
+            set { m_requestedAssetID = value; }
+        }
+    }
+
+    public delegate void TextureRequest(Object sender, TextureRequestArgs e);
+
     public delegate void ImprovedInstantMessage(LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, string fromAgentName, string message, byte dialog); // Cut down from full list
     public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos);
     public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west, IClientAPI remoteClient);
@@ -204,6 +231,7 @@ namespace OpenSim.Framework.Interfaces
     {
         event ImprovedInstantMessage OnInstantMessage;
         event ChatFromViewer OnChatFromViewer;
+        event TextureRequest OnRequestTexture;
         event RezObject OnRezObject;
         event ModifyTerrain OnModifyTerrain;
         event SetAppearance OnSetAppearance;