diff options
Diffstat (limited to 'OpenSim/OpenSim.World/Avatar.cs')
-rw-r--r-- | OpenSim/OpenSim.World/Avatar.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs index 77c18bf..2469860 100644 --- a/OpenSim/OpenSim.World/Avatar.cs +++ b/OpenSim/OpenSim.World/Avatar.cs | |||
@@ -37,15 +37,16 @@ namespace OpenSim.world | |||
37 | private ushort m_regionWaterHeight; | 37 | private ushort m_regionWaterHeight; |
38 | private bool m_regionTerraform; | 38 | private bool m_regionTerraform; |
39 | private bool childAvatar = false; | 39 | private bool childAvatar = false; |
40 | private RegionInfo regionData; | ||
40 | 41 | ||
41 | public Avatar(IClientAPI TheClient, World world, string regionName, Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater) | 42 | public Avatar(IClientAPI TheClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat) |
42 | { | 43 | { |
43 | m_world = world; | 44 | m_world = world; |
44 | // m_clientThreads = clientThreads; | 45 | // m_clientThreads = clientThreads; |
45 | m_regionName = regionName; | 46 | m_regionName = regionData.RegionName; |
46 | m_regionHandle = regionHandle; | 47 | m_regionHandle = regionData.RegionHandle; |
47 | m_regionTerraform = regionTerraform; | 48 | m_regionTerraform = regionData.RegionTerraform; |
48 | m_regionWaterHeight = regionWater; | 49 | m_regionWaterHeight = regionData.RegionWaterHeight; |
49 | 50 | ||
50 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); | 51 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); |
51 | ControllingClient = TheClient; | 52 | ControllingClient = TheClient; |