aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--Common/OpenSim.Framework/RegionCommsListener.cs2
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Entity.cs9
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs22
-rw-r--r--OpenSim/OpenSim.Region/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs4
7 files changed, 20 insertions, 25 deletions
diff --git a/Common/OpenSim.Framework/RegionCommsListener.cs b/Common/OpenSim.Framework/RegionCommsListener.cs
index 3fec937..bba928f 100644
--- a/Common/OpenSim.Framework/RegionCommsListener.cs
+++ b/Common/OpenSim.Framework/RegionCommsListener.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework
56 return false; 56 return false;
57 } 57 }
58 58
59 public virtual bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 59 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
60 { 60 {
61 if (OnAvatarCrossingIntoRegion != null) 61 if (OnAvatarCrossingIntoRegion != null)
62 { 62 {
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
index 6e963d2..06e09f2 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
+++ b/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
@@ -168,7 +168,7 @@ namespace OpenSim.LocalCommunications
168 if (this.regionHosts.ContainsKey(regionHandle)) 168 if (this.regionHosts.ContainsKey(regionHandle))
169 { 169 {
170 // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing"); 170 // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
171 this.regionHosts[regionHandle].ExpectAvatarCrossing(regionHandle, agentID, position); 171 this.regionHosts[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
172 return true; 172 return true;
173 } 173 }
174 return false; 174 return false;
diff --git a/OpenSim/OpenSim.Region/Scenes/Entity.cs b/OpenSim/OpenSim.Region/Scenes/Entity.cs
index 2376fc4..bd9309b 100644
--- a/OpenSim/OpenSim.Region/Scenes/Entity.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Entity.cs
@@ -38,10 +38,9 @@ namespace OpenSim.Region.Scenes
38 public abstract class Entity : IScriptReadonlyEntity 38 public abstract class Entity : IScriptReadonlyEntity
39 { 39 {
40 public libsecondlife.LLUUID uuid; 40 public libsecondlife.LLUUID uuid;
41 public LLVector3 velocity;
42 public Quaternion rotation; 41 public Quaternion rotation;
43 protected List<Entity> children; 42 protected List<Entity> children;
44 protected LLVector3 m_pos; 43
45 protected PhysicsActor _physActor; 44 protected PhysicsActor _physActor;
46 protected Scene m_world; 45 protected Scene m_world;
47 protected string m_name; 46 protected string m_name;
@@ -54,6 +53,7 @@ namespace OpenSim.Region.Scenes
54 get { return m_name; } 53 get { return m_name; }
55 } 54 }
56 55
56 protected LLVector3 m_pos;
57 /// <summary> 57 /// <summary>
58 /// 58 ///
59 /// </summary> 59 /// </summary>
@@ -92,6 +92,11 @@ namespace OpenSim.Region.Scenes
92 } 92 }
93 } 93 }
94 94
95 public LLVector3 velocity;
96
97 /// <summary>
98 ///
99 /// </summary>
95 public virtual LLVector3 Velocity 100 public virtual LLVector3 Velocity
96 { 101 {
97 get 102 get
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index 74b4945..63a6e37 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -739,7 +739,7 @@ namespace OpenSim.Region.Scenes
739 /// <summary> 739 /// <summary>
740 /// 740 ///
741 /// </summary> 741 /// </summary>
742 protected void InformClientOfNeighbours(IClientAPI remoteClient) 742 public void InformClientOfNeighbours(IClientAPI remoteClient)
743 { 743 {
744 // Console.WriteLine("informing client of neighbouring regions"); 744 // Console.WriteLine("informing client of neighbouring regions");
745 List<RegionInfo> neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo); 745 List<RegionInfo> neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs
index 3885c0d..b14db31 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Update.cs
@@ -76,26 +76,14 @@ namespace OpenSim.Region.Scenes
76 /// <summary> 76 /// <summary>
77 /// 77 ///
78 /// </summary> 78 /// </summary>
79 /// <returns></returns>
80 public ObjectUpdatePacket CreateUpdatePacket()
81 {
82 return null;
83 }
84
85 /// <summary>
86 ///
87 /// </summary>
88 public void SendInitialPosition() 79 public void SendInitialPosition()
89 { 80 {
90 this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos); 81 this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);
91 } 82 if (this.newAvatar)
92 83 {
93 /// <summary> 84 this.m_world.InformClientOfNeighbours(this.ControllingClient);
94 /// 85 this.newAvatar = false;
95 /// </summary> 86 }
96 public void SendOurAppearance()
97 {
98
99 } 87 }
100 88
101 /// <summary> 89 /// <summary>
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index 3fbda39..e22528a 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Region.Scenes
61 private ulong m_regionHandle; 61 private ulong m_regionHandle;
62 private bool childAvatar = false; 62 private bool childAvatar = false;
63 private bool newForce = false; 63 private bool newForce = false;
64 private bool newAvatar = false;
64 65
65 protected RegionInfo m_regionInfo; 66 protected RegionInfo m_regionInfo;
66 /// <summary> 67 /// <summary>
@@ -145,6 +146,7 @@ namespace OpenSim.Region.Scenes
145 { 146 {
146 //this.childAvatar = false; 147 //this.childAvatar = false;
147 this.Pos = pos; 148 this.Pos = pos;
149 this.newAvatar = true;
148 } 150 }
149 151
150 protected void DownGradeAvatar() 152 protected void DownGradeAvatar()
@@ -179,7 +181,7 @@ namespace OpenSim.Region.Scenes
179 NewForce force = this.forcesList[i]; 181 NewForce force = this.forcesList[i];
180 182
181 this.updateflag = true; 183 this.updateflag = true;
182 this.Velocity = new LLVector3(force.X, force.Y, force.Z); //shouldn't really be doing this 184 this.Velocity = new LLVector3(force.X, force.Y, force.Z);
183 this.newForce = true; 185 this.newForce = true;
184 } 186 }
185 for (int i = 0; i < this.forcesList.Count; i++) 187 for (int i = 0; i < this.forcesList.Count; i++)
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index e8af8c1..32aed02 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -154,8 +154,8 @@ namespace OpenSim
154 mapReply.AgentData.Flags = 0; 154 mapReply.AgentData.Flags = 0;
155 mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1]; 155 mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
156 mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock(); 156 mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
157 mapReply.LayerData[0].Bottom = 1; 157 mapReply.LayerData[0].Bottom = 0;
158 mapReply.LayerData[0].Left = 1; 158 mapReply.LayerData[0].Left = 0;
159 mapReply.LayerData[0].Top = 30000; 159 mapReply.LayerData[0].Top = 30000;
160 mapReply.LayerData[0].Right = 30000; 160 mapReply.LayerData[0].Right = 30000;
161 mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006"); 161 mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");