aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.World
diff options
context:
space:
mode:
authorMW2007-06-09 22:06:39 +0000
committerMW2007-06-09 22:06:39 +0000
commited899c30f693138b4f69220b920e5456a9307bee (patch)
tree56f8df462df0bf0d98fec944985af0e28393620a /OpenSim/OpenSim.World
parent* follow up ignore of generated files (diff)
downloadopensim-SC-ed899c30f693138b4f69220b920e5456a9307bee.zip
opensim-SC-ed899c30f693138b4f69220b920e5456a9307bee.tar.gz
opensim-SC-ed899c30f693138b4f69220b920e5456a9307bee.tar.bz2
opensim-SC-ed899c30f693138b4f69220b920e5456a9307bee.tar.xz
a couple of changes/fixes
Diffstat (limited to 'OpenSim/OpenSim.World')
-rw-r--r--OpenSim/OpenSim.World/Avatar.Update.cs3
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs6
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 7a57ba4..c0d120a 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -42,8 +42,7 @@ namespace OpenSim.world
42 /// </summary> 42 /// </summary>
43 public void SendInitialPosition() 43 public void SendInitialPosition()
44 { 44 {
45 Console.WriteLine("sending initial Avatar data"); 45 this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
46 this.ControllingClient.SendAvatarData(m_regInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
47 } 46 }
48 47
49 /// <summary> 48 /// <summary>
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index 4ab576c..77e0300 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -35,7 +35,7 @@ namespace OpenSim.world
35 private Dictionary<uint, IClientAPI> m_clientThreads; 35 private Dictionary<uint, IClientAPI> m_clientThreads;
36 private bool childAvatar = false; 36 private bool childAvatar = false;
37 37
38 private RegionInfo m_regInfo; 38 protected RegionInfo m_regionInfo;
39 /// <summary> 39 /// <summary>
40 /// 40 ///
41 /// </summary> 41 /// </summary>
@@ -50,7 +50,7 @@ namespace OpenSim.world
50 m_clientThreads = clientThreads; 50 m_clientThreads = clientThreads;
51 this.uuid = theClient.AgentId; 51 this.uuid = theClient.AgentId;
52 52
53 m_regInfo = reginfo; 53 m_regionInfo = reginfo;
54 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); 54 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
55 ControllingClient = theClient; 55 ControllingClient = theClient;
56 this.firstname = ControllingClient.FirstName; 56 this.firstname = ControllingClient.FirstName;
@@ -144,7 +144,7 @@ namespace OpenSim.world
144 /// </summary> 144 /// </summary>
145 public void CompleteMovement() 145 public void CompleteMovement()
146 { 146 {
147 this.ControllingClient.MoveAgentIntoRegion(m_regInfo); 147 this.ControllingClient.MoveAgentIntoRegion(m_regionInfo);
148 } 148 }
149 149
150 /// <summary> 150 /// <summary>