diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
index 53ed74a899..4081a7522b 100644
--- a/OpenSim/Region/Environment/Modules/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -61,6 +61,8 @@ namespace OpenSim.Region.Environment.Modules
             }
             scene.EventManager.OnNewClient += OnNewClient;
             scene.EventManager.OnGridInstantMessageToFriendsModule += OnGridInstantMessage;
+            scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
+            
             
         }
         public XmlRpcResponse processPresenceUpdate(XmlRpcRequest req)
@@ -82,8 +84,15 @@ namespace OpenSim.Region.Environment.Modules
             client.OnApproveFriendRequest += OnApprovedFriendRequest;
             client.OnDenyFriendRequest += OnDenyFriendRequest;
             client.OnTerminateFriendship += OnTerminateFriendship;
+            
+            
 
             
+        }
+
+        private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
+        {
+            int i = 0;
         }
 
         private void OnInstantMessage(IClientAPI client,LLUUID fromAgentID,
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 9b804449af..9f3c924c35 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1484,7 +1484,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (Util.GetDistanceTo(AbsolutePosition, posLastSignificantMove) > 0.5)
             {
                 posLastSignificantMove = AbsolutePosition;
-                
+                handler001 = OnSignificantClientMovement;
                 if (handler001 != null)
                 {
                     handler001(m_controllingClient);