From 27f003b68314ea5136632d6f9d14057c96ade1e1 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 29 Oct 2007 09:51:23 +0000
Subject: 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.

---
 OpenSim/Region/ClientStack/ClientView.API.cs            |  1 +
 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 74f1824..ba8bf02 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -46,6 +46,7 @@ namespace OpenSim.Region.ClientStack
         public event ViewerEffectEventHandler OnViewerEffect;
         public event ImprovedInstantMessage OnInstantMessage;
         public event ChatFromViewer OnChatFromViewer;
+        public event TextureRequest OnRequestTexture;
         public event RezObject OnRezObject;
         public event GenericCall4 OnDeRezObject;
         public event ModifyTerrain OnModifyTerrain;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 65a0e44..8a1a520 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.AgentSit:
                         if (OnAgentSit != null)
                         {
-                            AgentSitPacket agentSit = (AgentSitPacket) Pack;
+                            AgentSitPacket agentSit = (AgentSitPacket)Pack;
                             OnAgentSit(this, agentSit.AgentData.AgentID);
                         }
                         break;
@@ -364,7 +364,17 @@ namespace OpenSim.Region.ClientStack
                         for (int i = 0; i < imageRequest.RequestImage.Length; i++)
                         {
 
-                            //  Console.WriteLine("image request of "+ imageRequest.RequestImage[i].Image+ " at discard level " + imageRequest.RequestImage[i].DiscardLevel);
+                            // still working on the Texture download module so for now using old method
+                            //  TextureRequestArgs args = new TextureRequestArgs();
+                            //  args.RequestedAssetID = imageRequest.RequestImage[i].Image;
+                            //  args.DiscardLevel = imageRequest.RequestImage[i].DiscardLevel;
+                            //  args.PacketNumber = imageRequest.RequestImage[i].Packet;
+
+                            //  if (OnRequestTexture != null)
+                            //  {
+                            //      OnRequestTexture(this, args);
+                            //  }
+
                             m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image, imageRequest.RequestImage[i].Packet, imageRequest.RequestImage[i].DiscardLevel);
                         }
                         break;
-- 
cgit v1.1