diff options
author | John Hurliman | 2009-10-30 00:08:41 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-30 00:08:41 -0700 |
commit | a05c67bebb8a504858706619335c035948907158 (patch) | |
tree | 2882739f215c14b6ab3e4628111daa048346d327 /OpenSim/Tools | |
parent | * Fixed a NullReferenceException in GetMovementAnimation() and added more pro... (diff) | |
download | opensim-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/Tools')
-rw-r--r-- | OpenSim/Tools/pCampBot/PhysicsBot.cs | 19 |
1 files changed, 11 insertions, 8 deletions
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 | { |