From 862dc9fe975bdaa71116c8449ac27289f860441e Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 13 Jul 2007 21:13:38 +0000
Subject: *Reworked parcel joining to work the same way as LL's method.
 **Parcels within selection now join and not the two parcels selected at each
 corner *Created OnSignificantClientMovement event that is triggered when an
 avatar moves more than 2 meters.

---
 OpenSim/Region/Environment/Scenes/Scene.cs         | 2 ++
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a1b060f..7098c38 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -484,6 +484,8 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
             client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
             client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
+
+            client.OnSignificantClientMovement += new SignificantClientMovement(parcelManager.handleSignificantClientMovement);
         }
 
         protected void CreateAndAddScenePresence(IClientAPI client)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index a813aed..613ad52 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -479,8 +479,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (libsecondlife.Helpers.VecDist(this.Pos, this.posLastSignificantMove) > 2.0)
             {
                 this.posLastSignificantMove = this.Pos;
-                this.m_world.parcelManager.handleSignificantClientMovement(this.ControllingClient);
-                
+                this.ControllingClient.TriggerSignificantClientMovement(this.ControllingClient);
             }
         }
         #endregion
-- 
cgit v1.1