aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authormingchen2007-07-12 20:33:10 +0000
committermingchen2007-07-12 20:33:10 +0000
commitdf24ce6dfd803c5fcf6b0958ce14c455331a87b4 (patch)
treecab7170c4fee0bd32b5efed24c350bddfbd404c9 /OpenSim/Region/Environment/Scenes
parent*Found and fixed bug that crashed viewer when logging in or viewing land owners (diff)
downloadopensim-SC_OLD-df24ce6dfd803c5fcf6b0958ce14c455331a87b4.zip
opensim-SC_OLD-df24ce6dfd803c5fcf6b0958ce14c455331a87b4.tar.gz
opensim-SC_OLD-df24ce6dfd803c5fcf6b0958ce14c455331a87b4.tar.bz2
opensim-SC_OLD-df24ce6dfd803c5fcf6b0958ce14c455331a87b4.tar.xz
*Parcel and estate support fully restored into Sugilite
*Significant movement (currently set to 2 meters of movement for performance reasons, even though its speedy) and initial login now sends parcel updates
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs22
2 files changed, 23 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d526b3c..4a4b7a0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -492,7 +492,8 @@ namespace OpenSim.Region.Environment.Scenes
492 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); 492 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
493 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); 493 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
494 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 494 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
495 495
496
496 this.estateManager.sendRegionHandshake(client); 497 this.estateManager.sendRegionHandshake(client);
497 CreateAndAddScenePresence(client); 498 CreateAndAddScenePresence(client);
498 499
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8134276..037b19d 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -40,6 +40,9 @@ namespace OpenSim.Region.Environment.Scenes
40{ 40{
41 public partial class ScenePresence : Entity 41 public partial class ScenePresence : Entity
42 { 42 {
43
44
45
43 public static bool PhysicsEngineFlying = false; 46 public static bool PhysicsEngineFlying = false;
44 public static AvatarAnimations Animations; 47 public static AvatarAnimations Animations;
45 public static byte[] DefaultTexture; 48 public static byte[] DefaultTexture;
@@ -75,7 +78,10 @@ namespace OpenSim.Region.Environment.Scenes
75 DIR_CONTROL_FLAG_UP = MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS, 78 DIR_CONTROL_FLAG_UP = MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS,
76 DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG 79 DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG
77 } 80 }
78 81 /// <summary>
82 /// Position at which a significant movement was made
83 /// </summary>
84 private LLVector3 posLastSignificantMove = new LLVector3();
79 #region Properties 85 #region Properties
80 /// <summary> 86 /// <summary>
81 /// 87 ///
@@ -359,7 +365,9 @@ namespace OpenSim.Region.Environment.Scenes
359 } 365 }
360 } 366 }
361 367
368 this.CheckForSignificantMovement();
362 this.CheckForBorderCrossing(); 369 this.CheckForBorderCrossing();
370
363 } 371 }
364 } 372 }
365 #endregion 373 #endregion
@@ -465,6 +473,18 @@ namespace OpenSim.Region.Environment.Scenes
465 } 473 }
466 #endregion 474 #endregion
467 475
476 #region Significant Movement Method
477
478 protected void CheckForSignificantMovement()
479 {
480 if (libsecondlife.Helpers.VecDist(this.Pos, this.posLastSignificantMove) > 2.0)
481 {
482 this.posLastSignificantMove = this.Pos;
483 this.m_world.parcelManager.handleSignificantClientMovement(this.ControllingClient);
484
485 }
486 }
487 #endregion
468 #region Border Crossing Methods 488 #region Border Crossing Methods
469 /// <summary> 489 /// <summary>
470 /// 490 ///