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/TestSuite/PhysicsBot.cs | |
parent | * Fixed a NullReferenceException in GetMovementAnimation() and added more pro... (diff) | |
download | opensim-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 'OpenSim/TestSuite/PhysicsBot.cs')
-rw-r--r-- | OpenSim/TestSuite/PhysicsBot.cs | 19 |
1 files changed, 11 insertions, 8 deletions
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 | { |