diff options
Diffstat (limited to 'src/world/Avatar.cs')
-rw-r--r-- | src/world/Avatar.cs | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/world/Avatar.cs b/src/world/Avatar.cs index fc1b4a2..f3905cd 100644 --- a/src/world/Avatar.cs +++ b/src/world/Avatar.cs | |||
@@ -12,8 +12,6 @@ namespace OpenSim.world | |||
12 | public string firstname; | 12 | public string firstname; |
13 | public string lastname; | 13 | public string lastname; |
14 | public OpenSimClient ControllingClient; | 14 | public OpenSimClient ControllingClient; |
15 | public uint CurrentKeyMask; | ||
16 | |||
17 | private libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate; | 15 | private libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate; |
18 | 16 | ||
19 | public Avatar(OpenSimClient TheClient) { | 17 | public Avatar(OpenSimClient TheClient) { |
@@ -23,21 +21,7 @@ namespace OpenSim.world | |||
23 | } | 21 | } |
24 | 22 | ||
25 | public void update() { | 23 | public void update() { |
26 | lock(this) { | 24 | base.update(); |
27 | base.update(); | ||
28 | |||
29 | if((this.CurrentKeyMask & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_AT_POS) != 0) { | ||
30 | if((this.velocity.X>230) & (this.velocity.Y>230)) { | ||
31 | this.velocity.X=230; | ||
32 | this.velocity.Y=230; | ||
33 | this.velocity.Z=0; | ||
34 | } | ||
35 | } else { | ||
36 | this.velocity.X=0; | ||
37 | this.velocity.Y=0; | ||
38 | this.velocity.Z=0; | ||
39 | } | ||
40 | } | ||
41 | } | 25 | } |
42 | 26 | ||
43 | private void SetupTemplate(string name) | 27 | private void SetupTemplate(string name) |