2 files changed, 43 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
index d9f09f7..d2fcba9 100644
--- a/OpenSim/Region/Environment/Modules/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -27,24 +27,61 @@
 */
 
 using Nini.Config;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using libsecondlife;
+using libsecondlife.Packets;
 
 namespace OpenSim.Region.Environment.Modules
 {
     public class FriendsModule : IRegionModule
     {
-        private Scene m_scene;
+        private List<Scene> m_scenes = new List<Scene>();
+        private LogBase m_log;
 
         public void Initialise(Scene scene, IConfigSource config)
         {
-            m_scene = scene;
+            m_log = MainLog.Instance;
+            if (!m_scenes.Contains(scene))
+            {
+                m_scenes.Add(scene);
+                scene.EventManager.OnNewClient += OnNewClient;
+            }
+        }
+
+        private void OnNewClient(IClientAPI client)
+        {
+            FormFriendship(client,new Guid("c43a67ab-b196-4d62-936c-b40369547dee"));
+            FormFriendship(client, new Guid("0a2f777b-f44c-4662-8b22-c90ae038a3e6"));
         }
 
         public void PostInitialise()
         {
         }
 
+        private void FormFriendship(IClientAPI client, Guid friend)
+        {
+            foreach (Scene scene in m_scenes)
+            {
+                if (scene.Entities.ContainsKey(client.AgentId) && scene.Entities[client.AgentId] is ScenePresence)
+                {
+                    OnlineNotificationPacket ONPack = new OnlineNotificationPacket();
+                    OnlineNotificationPacket.AgentBlockBlock[] AgentBlock = new OnlineNotificationPacket.AgentBlockBlock[1];
+
+                    AgentBlock[0] = new OnlineNotificationPacket.AgentBlockBlock();
+                    AgentBlock[0].AgentID = new LLUUID(friend);
+                    ONPack.AgentBlock = AgentBlock;
+                    client.OutPacket(ONPack,ThrottleOutPacketType.Task);
+                }
+            }
+
+        }
+
         public void Close()
         {
         }
@@ -56,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules
 
         public bool IsSharedModule
         {
-            get { return false; }
+            get { return true; }
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
index d539dc4..1e56b94 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
@@ -29,6 +29,8 @@
 using System;

 using libsecondlife;

 using OpenSim.Framework;

+using OpenSim.Grid.ScriptServer;

+using OpenSim.Region.ScriptEngine.DotNetEngine;

 

 namespace OpenSim.Region.ScriptEngine.RemoteServer

 {

@@ -39,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
     internal class EventManager

     {

 

-        System.Collections.Generic.Dictionary<uint, OpenSim.Grid.ScriptServer.RemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, OpenSim.Grid.ScriptServer.RemotingObject>();

+        System.Collections.Generic.Dictionary<uint, RemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, OpenSim.Grid.ScriptServer.RemotingObject>();

 

 

         private ScriptEngine myScriptEngine;