diff options
Diffstat (limited to 'OpenSim/OpenSim.Region/Scenes/Avatar.cs')
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/Avatar.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.cs b/OpenSim/OpenSim.Region/Scenes/Avatar.cs index 6b393a8..3e371f0 100644 --- a/OpenSim/OpenSim.Region/Scenes/Avatar.cs +++ b/OpenSim/OpenSim.Region/Scenes/Avatar.cs | |||
@@ -59,7 +59,6 @@ namespace OpenSim.Region.Scenes | |||
59 | private AvatarWearable[] Wearables; | 59 | private AvatarWearable[] Wearables; |
60 | private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); | 60 | private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); |
61 | private ulong m_regionHandle; | 61 | private ulong m_regionHandle; |
62 | private Dictionary<uint, IClientAPI> m_clientThreads; | ||
63 | private bool childAvatar = false; | 62 | private bool childAvatar = false; |
64 | private bool newForce = false; | 63 | private bool newForce = false; |
65 | 64 | ||
@@ -71,11 +70,10 @@ namespace OpenSim.Region.Scenes | |||
71 | /// <param name="world"></param> | 70 | /// <param name="world"></param> |
72 | /// <param name="clientThreads"></param> | 71 | /// <param name="clientThreads"></param> |
73 | /// <param name="regionDat"></param> | 72 | /// <param name="regionDat"></param> |
74 | public Avatar(IClientAPI theClient, Scene world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo) | 73 | public Avatar(IClientAPI theClient, Scene world, RegionInfo reginfo) |
75 | { | 74 | { |
76 | 75 | ||
77 | m_world = world; | 76 | m_world = world; |
78 | m_clientThreads = clientThreads; | ||
79 | this.uuid = theClient.AgentId; | 77 | this.uuid = theClient.AgentId; |
80 | 78 | ||
81 | m_regionInfo = reginfo; | 79 | m_regionInfo = reginfo; |
@@ -84,7 +82,7 @@ namespace OpenSim.Region.Scenes | |||
84 | ControllingClient = theClient; | 82 | ControllingClient = theClient; |
85 | this.firstname = ControllingClient.FirstName; | 83 | this.firstname = ControllingClient.FirstName; |
86 | this.lastname = ControllingClient.LastName; | 84 | this.lastname = ControllingClient.LastName; |
87 | localid = this.m_world.NextLocalId; | 85 | m_localId = m_world.NextLocalId; |
88 | Pos = ControllingClient.StartPos; | 86 | Pos = ControllingClient.StartPos; |
89 | visualParams = new byte[218]; | 87 | visualParams = new byte[218]; |
90 | for (int i = 0; i < 218; i++) | 88 | for (int i = 0; i < 218; i++) |
@@ -196,7 +194,7 @@ namespace OpenSim.Region.Scenes | |||
196 | { | 194 | { |
197 | LLVector3 pos = this.Pos; | 195 | LLVector3 pos = this.Pos; |
198 | LLVector3 vel = this.Velocity; | 196 | LLVector3 vel = this.Velocity; |
199 | RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.localid, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z)); | 197 | RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z)); |
200 | } | 198 | } |
201 | 199 | ||
202 | /// <summary> | 200 | /// <summary> |