aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-30 00:08:41 -0700
committerJohn Hurliman2009-10-30 00:08:41 -0700
commita05c67bebb8a504858706619335c035948907158 (patch)
tree2882739f215c14b6ab3e4628111daa048346d327
parent* Fixed a NullReferenceException in GetMovementAnimation() and added more pro... (diff)
downloadopensim-SC-a05c67bebb8a504858706619335c035948907158.zip
opensim-SC-a05c67bebb8a504858706619335c035948907158.tar.gz
opensim-SC-a05c67bebb8a504858706619335c035948907158.tar.bz2
opensim-SC-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 '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs12
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs8
-rw-r--r--OpenSim/TestSuite/PhysicsBot.cs19
-rw-r--r--OpenSim/Tools/pCampBot/PhysicsBot.cs19
-rw-r--r--bin/OpenMetaverse.dllbin1642496 -> 1650688 bytes
-rw-r--r--bin/OpenSim.ini.example2
6 files changed, 33 insertions, 27 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 {
diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs
index 9c9c1ea..fac4275 100644
--- a/OpenSim/TestSuite/PhysicsBot.cs
+++ b/OpenSim/TestSuite/PhysicsBot.cs
@@ -130,9 +130,9 @@ namespace OpenSim.TestSuite
130 public void startup() 130 public void startup()
131 { 131 {
132 client.Settings.LOGIN_SERVER = loginURI; 132 client.Settings.LOGIN_SERVER = loginURI;
133 client.Network.OnConnected += new NetworkManager.ConnectedCallback(this.Network_OnConnected); 133 client.Network.LoginProgress += this.Network_LoginProgress;
134 client.Network.OnSimConnected += new NetworkManager.SimConnectedCallback(this.Network_OnConnected); 134 client.Network.SimConnected += this.Network_SimConnected;
135 client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected); 135 client.Network.Disconnected += this.Network_OnDisconnected;
136 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name")) 136 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name"))
137 { 137 {
138 138
@@ -155,19 +155,22 @@ namespace OpenSim.TestSuite
155 } 155 }
156 } 156 }
157 157
158 public void Network_OnConnected(object sender) 158 public void Network_LoginProgress(object sender, LoginProgressEventArgs args)
159 { 159 {
160 if (OnConnected != null) 160 if (args.Status == LoginStatus.Success)
161 { 161 {
162 OnConnected(this, EventType.CONNECTED); 162 if (OnConnected != null)
163 {
164 OnConnected(this, EventType.CONNECTED);
165 }
163 } 166 }
164 } 167 }
165 168
166 public void Simulator_Connected(object sender) 169 public void Network_SimConnected(object sender, SimConnectedEventArgs args)
167 { 170 {
168 } 171 }
169 172
170 public void Network_OnDisconnected(NetworkManager.DisconnectType reason, string message) 173 public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
171 { 174 {
172 if (OnDisconnected != null) 175 if (OnDisconnected != null)
173 { 176 {
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index 38986a2..5d4af31 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -151,9 +151,9 @@ namespace pCampBot
151 client.Throttle.Texture = 100000; 151 client.Throttle.Texture = 100000;
152 client.Throttle.Wind = 100000; 152 client.Throttle.Wind = 100000;
153 client.Throttle.Total = 400000; 153 client.Throttle.Total = 400000;
154 client.Network.OnConnected += new NetworkManager.ConnectedCallback(this.Network_OnConnected); 154 client.Network.LoginProgress += this.Network_LoginProgress;
155 client.Network.OnSimConnected += new NetworkManager.SimConnectedCallback(this.Network_OnConnected); 155 client.Network.SimConnected += this.Network_SimConnected;
156 client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(this.Network_OnDisconnected); 156 client.Network.Disconnected += this.Network_OnDisconnected;
157 client.Objects.ObjectUpdate += Objects_NewPrim; 157 client.Objects.ObjectUpdate += Objects_NewPrim;
158 //client.Assets.OnAssetReceived += Asset_ReceivedCallback; 158 //client.Assets.OnAssetReceived += Asset_ReceivedCallback;
159 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name")) 159 if (client.Network.Login(firstname, lastname, password, "pCampBot", "Your name"))
@@ -349,19 +349,22 @@ namespace pCampBot
349 return clothfolder; 349 return clothfolder;
350 } 350 }
351 351
352 public void Network_OnConnected(object sender) 352 public void Network_LoginProgress(object sender, LoginProgressEventArgs args)
353 { 353 {
354 if (OnConnected != null) 354 if (args.Status == LoginStatus.Success)
355 { 355 {
356 OnConnected(this, EventType.CONNECTED); 356 if (OnConnected != null)
357 {
358 OnConnected(this, EventType.CONNECTED);
359 }
357 } 360 }
358 } 361 }
359 362
360 public void Simulator_Connected(object sender) 363 public void Network_SimConnected(object sender, SimConnectedEventArgs args)
361 { 364 {
362 } 365 }
363 366
364 public void Network_OnDisconnected(NetworkManager.DisconnectType reason, string message) 367 public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
365 { 368 {
366 if (OnDisconnected != null) 369 if (OnDisconnected != null)
367 { 370 {
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 8b07942..edbf3ce 100644
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 3877164..3952e2d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -42,7 +42,7 @@
42 ; SmartThreadPool is reported to work well on Mono/Linux, but 42 ; SmartThreadPool is reported to work well on Mono/Linux, but
43 ; UnsafeQueueUserWorkItem has been benchmarked with better 43 ; UnsafeQueueUserWorkItem has been benchmarked with better
44 ; performance on .NET/Windows 44 ; performance on .NET/Windows
45 ;async_call_method = SmartThreadPool 45 async_call_method = SmartThreadPool
46 46
47 ; There are several operations on large collections (such as 47 ; There are several operations on large collections (such as
48 ; the current avatar list) that can be run synchronously or 48 ; the current avatar list) that can be run synchronously or