diff options
author | MW | 2007-03-10 20:30:25 +0000 |
---|---|---|
committer | MW | 2007-03-10 20:30:25 +0000 |
commit | 76569ff4fba09f22ed4a06b8073deaed7f64a2e3 (patch) | |
tree | f83430652d8874f299733f505b6b7ded13910bb8 /src/OpenSimClient.cs | |
parent | Another attempt to fix the project files (diff) | |
download | opensim-SC_OLD-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.zip opensim-SC_OLD-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.tar.gz opensim-SC_OLD-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.tar.bz2 opensim-SC_OLD-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.tar.xz |
A PhysX physics plugin (that actually uses physX now but currently only works on windows)
Can now change direction when walking without stopping
Flying works when using the Physx dll
Diffstat (limited to 'src/OpenSimClient.cs')
-rw-r--r-- | src/OpenSimClient.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/OpenSimClient.cs b/src/OpenSimClient.cs index 50d8c78..dd698e4 100644 --- a/src/OpenSimClient.cs +++ b/src/OpenSimClient.cs | |||
@@ -135,8 +135,8 @@ namespace OpenSim | |||
135 | { | 135 | { |
136 | if(ent.localid == multipleupdate.ObjectData[ i ].ObjectLocalID) | 136 | if(ent.localid == multipleupdate.ObjectData[ i ].ObjectLocalID) |
137 | { | 137 | { |
138 | ent.position = pos; | 138 | ((OpenSim.world.Primitive)ent).UpdatePosition( pos); |
139 | ((OpenSim.world.Primitive)ent).UpdateFlag = true; | 139 | |
140 | } | 140 | } |
141 | } | 141 | } |
142 | 142 | ||
@@ -191,6 +191,7 @@ namespace OpenSim | |||
191 | OpenSim_Main.local_world.Entities.Remove(this.AgentID); | 191 | OpenSim_Main.local_world.Entities.Remove(this.AgentID); |
192 | } | 192 | } |
193 | //need to do other cleaning up here too | 193 | //need to do other cleaning up here too |
194 | OpenSim_Main.sim.ClientThreads.Remove(this.userEP); | ||
194 | this.ClientThread.Abort(); | 195 | this.ClientThread.Abort(); |
195 | break; | 196 | break; |
196 | case PacketType.ChatFromViewer: | 197 | case PacketType.ChatFromViewer: |
@@ -222,7 +223,7 @@ namespace OpenSim | |||
222 | { | 223 | { |
223 | foreach (Packet packet in NeedAck.Values) | 224 | foreach (Packet packet in NeedAck.Values) |
224 | { | 225 | { |
225 | if (now - packet.TickCount > RESEND_TIMEOUT) | 226 | if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) |
226 | { | 227 | { |
227 | ServerConsole.MainConsole.Instance.WriteLine("Resending " + packet.Type.ToString() + " packet, " + | 228 | ServerConsole.MainConsole.Instance.WriteLine("Resending " + packet.Type.ToString() + " packet, " + |
228 | (now - packet.TickCount) + "ms have passed"); | 229 | (now - packet.TickCount) + "ms have passed"); |