aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.World
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.World')
-rw-r--r--OpenSim/OpenSim.World/Avatar.Update.cs1
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs15
2 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 90be4b1..9a5e06c 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -28,6 +28,7 @@ namespace OpenSim.world
28 28
29 public void SendInitialPosition() 29 public void SendInitialPosition()
30 { 30 {
31 Console.WriteLine("sending initial Avatar data");
31 this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 100)); 32 this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 100));
32 } 33 }
33 34
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index bbc3a58..247e194 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -32,30 +32,30 @@ namespace OpenSim.world
32 private AvatarWearable[] Wearables; 32 private AvatarWearable[] Wearables;
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, ClientView> m_clientThreads; 35 private Dictionary<uint, IClientAPI> m_clientThreads;
36 private string m_regionName; 36 private string m_regionName;
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 private RegionInfo regionData;
41 41
42 public Avatar(IClientAPI TheClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat) 42 public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat)
43 { 43 {
44 Console.WriteLine("avatar point 1"); 44
45 m_world = world; 45 m_world = world;
46 // m_clientThreads = clientThreads; 46 m_clientThreads = clientThreads;
47 regionData = regionDat;
48 this.uuid = theClient.AgentId;
47 m_regionName = regionData.RegionName; 49 m_regionName = regionData.RegionName;
48 m_regionHandle = regionData.RegionHandle; 50 m_regionHandle = regionData.RegionHandle;
49 m_regionTerraform = regionData.RegionTerraform; 51 m_regionTerraform = regionData.RegionTerraform;
50 m_regionWaterHeight = regionData.RegionWaterHeight; 52 m_regionWaterHeight = regionData.RegionWaterHeight;
51 Console.WriteLine("avatar point 2");
52 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); 53 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
53 ControllingClient = TheClient; 54 ControllingClient = theClient;
54 this.firstname = ControllingClient.FirstName; 55 this.firstname = ControllingClient.FirstName;
55 this.lastname = ControllingClient.LastName; 56 this.lastname = ControllingClient.LastName;
56 localid = 8880000 + (this.m_world._localNumber++); 57 localid = 8880000 + (this.m_world._localNumber++);
57 Pos = ControllingClient.StartPos; 58 Pos = ControllingClient.StartPos;
58 Console.WriteLine("avatar point 3");
59 visualParams = new byte[218]; 59 visualParams = new byte[218];
60 for (int i = 0; i < 218; i++) 60 for (int i = 0; i < 218; i++)
61 { 61 {
@@ -136,6 +136,7 @@ namespace OpenSim.world
136 //really really should be moved somewhere else (RegionInfo.cs ?) 136 //really really should be moved somewhere else (RegionInfo.cs ?)
137 public void SendRegionHandshake() 137 public void SendRegionHandshake()
138 { 138 {
139 Console.WriteLine("sending handshake");
139 this.ControllingClient.SendRegionHandshake(this.regionData); 140 this.ControllingClient.SendRegionHandshake(this.regionData);
140 } 141 }
141 142