aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-30 00:08:41 -0700
committerJohn Hurliman2009-10-30 00:08:41 -0700
commita05c67bebb8a504858706619335c035948907158 (patch)
tree2882739f215c14b6ab3e4628111daa048346d327 /OpenSim/Region
parent* Fixed a NullReferenceException in GetMovementAnimation() and added more pro... (diff)
downloadopensim-SC_OLD-a05c67bebb8a504858706619335c035948907158.zip
opensim-SC_OLD-a05c67bebb8a504858706619335c035948907158.tar.gz
opensim-SC_OLD-a05c67bebb8a504858706619335c035948907158.tar.bz2
opensim-SC_OLD-a05c67bebb8a504858706619335c035948907158.tar.xz
* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll
* Prints a warning for any future packet splitting failures
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs12
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs8
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 1ff18d4..992d06f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4329,11 +4329,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4329 /// </summary> 4329 /// </summary>
4330 protected virtual void RegisterLocalPacketHandlers() 4330 protected virtual void RegisterLocalPacketHandlers()
4331 { 4331 {
4332 AddLocalPacketHandler(PacketType.LogoutRequest, Logout); 4332 AddLocalPacketHandler(PacketType.LogoutRequest, HandleLogout);
4333 AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate); 4333 AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate);
4334 AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect); 4334 AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect);
4335 AddLocalPacketHandler(PacketType.AgentCachedTexture, AgentTextureCached); 4335 AddLocalPacketHandler(PacketType.AgentCachedTexture, HandleAgentTextureCached);
4336 AddLocalPacketHandler(PacketType.MultipleObjectUpdate, MultipleObjUpdate); 4336 AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate);
4337 AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest); 4337 AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest);
4338 AddLocalPacketHandler(PacketType.ParcelBuy, HandleParcelBuyRequest); 4338 AddLocalPacketHandler(PacketType.ParcelBuy, HandleParcelBuyRequest);
4339 AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest); 4339 AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest);
@@ -4602,7 +4602,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4602 /// <param name="client"></param> 4602 /// <param name="client"></param>
4603 /// <param name="packet"></param> 4603 /// <param name="packet"></param>
4604 /// <returns></returns> 4604 /// <returns></returns>
4605 protected virtual bool Logout(IClientAPI client, Packet packet) 4605 protected virtual bool HandleLogout(IClientAPI client, Packet packet)
4606 { 4606 {
4607 if (packet.Type == PacketType.LogoutRequest) 4607 if (packet.Type == PacketType.LogoutRequest)
4608 { 4608 {
@@ -4640,7 +4640,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4640 /// <param name="simclient"></param> 4640 /// <param name="simclient"></param>
4641 /// <param name="packet"></param> 4641 /// <param name="packet"></param>
4642 /// <returns></returns> 4642 /// <returns></returns>
4643 protected bool AgentTextureCached(IClientAPI simclient, Packet packet) 4643 protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
4644 { 4644 {
4645 //m_log.Debug("texture cached: " + packet.ToString()); 4645 //m_log.Debug("texture cached: " + packet.ToString());
4646 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; 4646 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
@@ -4670,7 +4670,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4670 return true; 4670 return true;
4671 } 4671 }
4672 4672
4673 protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet) 4673 protected bool HandleMultipleObjUpdate(IClientAPI simClient, Packet packet)
4674 { 4674 {
4675 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; 4675 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
4676 if (multipleupdate.AgentData.SessionID != SessionId) return false; 4676 if (multipleupdate.AgentData.SessionID != SessionId) return false;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index a211508..9792bcd 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -256,8 +256,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
256 byte[][] datas = packet.ToBytesMultiple(); 256 byte[][] datas = packet.ToBytesMultiple();
257 int packetCount = datas.Length; 257 int packetCount = datas.Length;
258 258
259 //if (packetCount > 1) 259 if (packetCount < 1)
260 // m_log.Debug("[LLUDPSERVER]: Split " + packet.Type + " packet into " + packetCount + " packets"); 260 m_log.Error("[LLUDPSERVER]: Failed to split " + packet.Type + " with estimated length " + packet.Length);
261 261
262 for (int i = 0; i < packetCount; i++) 262 for (int i = 0; i < packetCount; i++)
263 { 263 {
@@ -295,8 +295,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
295 byte[][] datas = packet.ToBytesMultiple(); 295 byte[][] datas = packet.ToBytesMultiple();
296 int packetCount = datas.Length; 296 int packetCount = datas.Length;
297 297
298 //if (packetCount > 1) 298 if (packetCount < 1)
299 // m_log.Debug("[LLUDPSERVER]: Split " + packet.Type + " packet into " + packetCount + " packets"); 299 m_log.Error("[LLUDPSERVER]: Failed to split " + packet.Type + " with estimated length " + packet.Length);
300 300
301 for (int i = 0; i < packetCount; i++) 301 for (int i = 0; i < packetCount; i++)
302 { 302 {