aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorlbsa712007-08-16 17:08:03 +0000
committerlbsa712007-08-16 17:08:03 +0000
commit25fd8d02738e61e81f93ac784b02ab84697ee528 (patch)
treedb1dda71b3aa86770fa90ae84d4ac361a6fd84c7 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentDeleted old inventoryCache.cs (diff)
downloadopensim-SC_OLD-25fd8d02738e61e81f93ac784b02ab84697ee528.zip
opensim-SC_OLD-25fd8d02738e61e81f93ac784b02ab84697ee528.tar.gz
opensim-SC_OLD-25fd8d02738e61e81f93ac784b02ab84697ee528.tar.bz2
opensim-SC_OLD-25fd8d02738e61e81f93ac784b02ab84697ee528.tar.xz
* Introduced IScriptHost as an interface to fetching object data from scripts.
* This meant introducing AbsolutePosition on all objects (since SimChat wants that)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 6e4fcda..5dbf643 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Environment.Scenes
156 this.m_firstname = ControllingClient.FirstName; 156 this.m_firstname = ControllingClient.FirstName;
157 this.m_lastname = ControllingClient.LastName; 157 this.m_lastname = ControllingClient.LastName;
158 m_localId = m_scene.NextLocalId; 158 m_localId = m_scene.NextLocalId;
159 Pos = ControllingClient.StartPos; 159 AbsolutePosition = ControllingClient.StartPos;
160 160
161 visualParams = new byte[218]; 161 visualParams = new byte[218];
162 for (int i = 0; i < 218; i++) 162 for (int i = 0; i < 218; i++)
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Environment.Scenes
205 if (this.childAgent == true) 205 if (this.childAgent == true)
206 { 206 {
207 this.Velocity = new LLVector3(0, 0, 0); 207 this.Velocity = new LLVector3(0, 0, 0);
208 this.Pos = new LLVector3(128, 128, 70); 208 this.AbsolutePosition = new LLVector3(128, 128, 70);
209 209
210 } 210 }
211 } 211 }
@@ -217,7 +217,7 @@ namespace OpenSim.Region.Environment.Scenes
217 public void MakeAvatar(LLVector3 pos, bool isFlying) 217 public void MakeAvatar(LLVector3 pos, bool isFlying)
218 { 218 {
219 //this.childAvatar = false; 219 //this.childAvatar = false;
220 this.Pos = pos; 220 this.AbsolutePosition = pos;
221 this._physActor.Flying = isFlying; 221 this._physActor.Flying = isFlying;
222 this.newAvatar = true; 222 this.newAvatar = true;
223 this.childAgent = false; 223 this.childAgent = false;
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Environment.Scenes
236 /// <param name="pos"></param> 236 /// <param name="pos"></param>
237 public void Teleport(LLVector3 pos) 237 public void Teleport(LLVector3 pos)
238 { 238 {
239 this.Pos = pos; 239 this.AbsolutePosition = pos;
240 this.SendTerseUpdateToALLClients(); 240 this.SendTerseUpdateToALLClients();
241 } 241 }
242 242
@@ -278,7 +278,7 @@ namespace OpenSim.Region.Environment.Scenes
278 { 278 {
279 look = new LLVector3(0.99f, 0.042f, 0); 279 look = new LLVector3(0.99f, 0.042f, 0);
280 } 280 }
281 this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, Pos, look); 281 this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
282 if (this.childAgent) 282 if (this.childAgent)
283 { 283 {
284 this.childAgent = false; 284 this.childAgent = false;
@@ -427,7 +427,7 @@ namespace OpenSim.Region.Environment.Scenes
427 /// <param name="RemoteClient"></param> 427 /// <param name="RemoteClient"></param>
428 public void SendTerseUpdateToClient(IClientAPI RemoteClient) 428 public void SendTerseUpdateToClient(IClientAPI RemoteClient)
429 { 429 {
430 LLVector3 pos = this.Pos; 430 LLVector3 pos = this.AbsolutePosition;
431 LLVector3 vel = this.Velocity; 431 LLVector3 vel = this.Velocity;
432 RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z)); 432 RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));
433 } 433 }
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Environment.Scenes
450 /// <param name="remoteAvatar"></param> 450 /// <param name="remoteAvatar"></param>
451 public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) 451 public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
452 { 452 {
453 remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.m_firstname, this.m_lastname, this.m_uuid, this.LocalId, this.Pos, this.m_textureEntry.ToBytes()); 453 remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.m_firstname, this.m_lastname, this.m_uuid, this.LocalId, this.AbsolutePosition, this.m_textureEntry.ToBytes());
454 } 454 }
455 455
456 public void SendFullUpdateToALLClients() 456 public void SendFullUpdateToALLClients()
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Environment.Scenes
472 /// </summary> 472 /// </summary>
473 public void SendInitialData() 473 public void SendInitialData()
474 { 474 {
475 this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.m_firstname, this.m_lastname, this.m_uuid, this.LocalId, this.Pos, this.m_textureEntry.ToBytes()); 475 this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.m_firstname, this.m_lastname, this.m_uuid, this.LocalId, this.AbsolutePosition, this.m_textureEntry.ToBytes());
476 if (!this.childAgent) 476 if (!this.childAgent)
477 { 477 {
478 this.m_scene.InformClientOfNeighbours(this.ControllingClient); 478 this.m_scene.InformClientOfNeighbours(this.ControllingClient);
@@ -547,9 +547,9 @@ namespace OpenSim.Region.Environment.Scenes
547 547
548 protected void CheckForSignificantMovement() 548 protected void CheckForSignificantMovement()
549 { 549 {
550 if (libsecondlife.Helpers.VecDist(this.Pos, this.posLastSignificantMove) > 2.0) 550 if (libsecondlife.Helpers.VecDist(this.AbsolutePosition, this.posLastSignificantMove) > 2.0)
551 { 551 {
552 this.posLastSignificantMove = this.Pos; 552 this.posLastSignificantMove = this.AbsolutePosition;
553 if (OnSignificantClientMovement != null) 553 if (OnSignificantClientMovement != null)
554 { 554 {
555 OnSignificantClientMovement(this.ControllingClient); 555 OnSignificantClientMovement(this.ControllingClient);
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Environment.Scenes
564 /// </summary> 564 /// </summary>
565 protected void CheckForBorderCrossing() 565 protected void CheckForBorderCrossing()
566 { 566 {
567 LLVector3 pos2 = this.Pos; 567 LLVector3 pos2 = this.AbsolutePosition;
568 LLVector3 vel = this.Velocity; 568 LLVector3 vel = this.Velocity;
569 569
570 float timeStep = 0.1f; 570 float timeStep = 0.1f;
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Scenes
588 /// </summary> 588 /// </summary>
589 protected void CrossToNewRegion() 589 protected void CrossToNewRegion()
590 { 590 {
591 LLVector3 pos = this.Pos; 591 LLVector3 pos = this.AbsolutePosition;
592 LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z); 592 LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z);
593 uint neighbourx = this.m_regionInfo.RegionLocX; 593 uint neighbourx = this.m_regionInfo.RegionLocX;
594 uint neighboury = this.m_regionInfo.RegionLocY; 594 uint neighboury = this.m_regionInfo.RegionLocY;