aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.World/Avatar.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs16
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index ecd938b..368bc53 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -33,11 +33,7 @@ namespace OpenSim.world
33 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); 33 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
34 private ulong m_regionHandle; 34 private ulong m_regionHandle;
35 private Dictionary<uint, IClientAPI> m_clientThreads; 35 private Dictionary<uint, IClientAPI> m_clientThreads;
36 private string m_regionName;
37 private ushort m_regionWaterHeight;
38 private bool m_regionTerraform;
39 private bool childAvatar = false; 36 private bool childAvatar = false;
40 private RegionInfo regionData;
41 37
42 /// <summary> 38 /// <summary>
43 /// 39 ///
@@ -46,17 +42,13 @@ namespace OpenSim.world
46 /// <param name="world"></param> 42 /// <param name="world"></param>
47 /// <param name="clientThreads"></param> 43 /// <param name="clientThreads"></param>
48 /// <param name="regionDat"></param> 44 /// <param name="regionDat"></param>
49 public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat) 45 public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads)
50 { 46 {
51 47
52 m_world = world; 48 m_world = world;
53 m_clientThreads = clientThreads; 49 m_clientThreads = clientThreads;
54 regionData = regionDat;
55 this.uuid = theClient.AgentId; 50 this.uuid = theClient.AgentId;
56 m_regionName = regionData.RegionName; 51
57 m_regionHandle = regionData.RegionHandle;
58 m_regionTerraform = regionData.RegionTerraform;
59 m_regionWaterHeight = regionData.RegionWaterHeight;
60 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); 52 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
61 ControllingClient = theClient; 53 ControllingClient = theClient;
62 this.firstname = ControllingClient.FirstName; 54 this.firstname = ControllingClient.FirstName;
@@ -148,7 +140,7 @@ namespace OpenSim.world
148 /// </summary> 140 /// </summary>
149 public void CompleteMovement() 141 public void CompleteMovement()
150 { 142 {
151 this.ControllingClient.MoveAgentIntoRegion(this.regionData); 143 this.ControllingClient.MoveAgentIntoRegion(this.m_world.m_regInfo);
152 } 144 }
153 145
154 /// <summary> 146 /// <summary>
@@ -174,7 +166,7 @@ namespace OpenSim.world
174 /// </summary> 166 /// </summary>
175 public void SendRegionHandshake() 167 public void SendRegionHandshake()
176 { 168 {
177 this.ControllingClient.SendRegionHandshake(this.regionData); 169 this.m_world.estateManager.sendRegionHandshake(this.ControllingClient);
178 } 170 }
179 171
180 /// <summary> 172 /// <summary>