diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index d6a82efe85..580e06f516 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -395,7 +395,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             // if it leaves, we want to know, too
             client.OnLogout += OnLogout;
+            
             client.OnGrantUserRights += GrantUserFriendRights;
+            client.OnTrackAgentEvent += FindAgent;
+            client.OnFindAgentEvent += FindAgent;
 
         }
 
@@ -1114,6 +1117,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         {
             ((Scene)remoteClient.Scene).CommsManager.UpdateUserFriendPerms(requester, target, (uint)rights);
         }
+        public void FindAgent(IClientAPI remoteClient, UUID hunter, UUID target)
+        {
+        	List<FriendListItem> friendList = GetUserFriends(hunter);
+        	foreach (FriendListItem item in friendList)
+        	{
+        		if(item.onlinestatus == true)
+        		{
+        			if(item.Friend == target && (item.FriendPerms & (uint)FriendRights.CanSeeOnMap) != 0)
+        			{
+        				ScenePresence SPTarget = ((Scene)remoteClient.Scene).GetScenePresence(target);
+        				string regionname =  SPTarget.Scene.RegionInfo.RegionName;
+        				remoteClient.SendScriptTeleportRequest("FindAgent", regionname,new Vector3(SPTarget.AbsolutePosition),new Vector3(SPTarget.Lookat));
+        			}
+        		}
+        		else
+        		{
+        			remoteClient.SendAgentAlertMessage("The agent you are looking for is not online.", false);
+        		}
+        	}
+        }
 
         public List<FriendListItem> GetUserFriends(UUID agentID)
         {