diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 14 |
2 files changed, 13 insertions, 2 deletions
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 | |||
46 | public event ViewerEffectEventHandler OnViewerEffect; | 46 | public event ViewerEffectEventHandler OnViewerEffect; |
47 | public event ImprovedInstantMessage OnInstantMessage; | 47 | public event ImprovedInstantMessage OnInstantMessage; |
48 | public event ChatFromViewer OnChatFromViewer; | 48 | public event ChatFromViewer OnChatFromViewer; |
49 | public event TextureRequest OnRequestTexture; | ||
49 | public event RezObject OnRezObject; | 50 | public event RezObject OnRezObject; |
50 | public event GenericCall4 OnDeRezObject; | 51 | public event GenericCall4 OnDeRezObject; |
51 | public event ModifyTerrain OnModifyTerrain; | 52 | 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 | |||
210 | case PacketType.AgentSit: | 210 | case PacketType.AgentSit: |
211 | if (OnAgentSit != null) | 211 | if (OnAgentSit != null) |
212 | { | 212 | { |
213 | AgentSitPacket agentSit = (AgentSitPacket) Pack; | 213 | AgentSitPacket agentSit = (AgentSitPacket)Pack; |
214 | OnAgentSit(this, agentSit.AgentData.AgentID); | 214 | OnAgentSit(this, agentSit.AgentData.AgentID); |
215 | } | 215 | } |
216 | break; | 216 | break; |
@@ -364,7 +364,17 @@ namespace OpenSim.Region.ClientStack | |||
364 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) | 364 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) |
365 | { | 365 | { |
366 | 366 | ||
367 | // Console.WriteLine("image request of "+ imageRequest.RequestImage[i].Image+ " at discard level " + imageRequest.RequestImage[i].DiscardLevel); | 367 | // still working on the Texture download module so for now using old method |
368 | // TextureRequestArgs args = new TextureRequestArgs(); | ||
369 | // args.RequestedAssetID = imageRequest.RequestImage[i].Image; | ||
370 | // args.DiscardLevel = imageRequest.RequestImage[i].DiscardLevel; | ||
371 | // args.PacketNumber = imageRequest.RequestImage[i].Packet; | ||
372 | |||
373 | // if (OnRequestTexture != null) | ||
374 | // { | ||
375 | // OnRequestTexture(this, args); | ||
376 | // } | ||
377 | |||
368 | m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image, imageRequest.RequestImage[i].Packet, imageRequest.RequestImage[i].DiscardLevel); | 378 | m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image, imageRequest.RequestImage[i].Packet, imageRequest.RequestImage[i].DiscardLevel); |
369 | } | 379 | } |
370 | break; | 380 | break; |