1 files changed, 25 insertions, 18 deletions

diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerConnector.cs
index 94e4ed2..9a57cd9 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerConnector.cs
@@ -25,30 +25,37 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
 
-namespace OpenSim.Region.Communications.OGS1
+namespace OpenSim.Server.Handlers.Avatar
 {
-    public class CommunicationsOGS1 : CommunicationsManager
+    public class AvatarServiceConnector : ServiceConnector
     {
-        public CommunicationsOGS1(
-            NetworkServersInfo serversInfo,
-            LibraryRootFolder libraryRootFolder)
-            : base(serversInfo, libraryRootFolder)
+        private IAvatarService m_AvatarService;
+        private string m_ConfigName = "AvatarService";
+
+        public AvatarServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
-            // This plugin arrangement could eventually be configurable rather than hardcoded here.
-            OGS1UserServices userServices = new OGS1UserServices(this);
-            userServices.AddPlugin(new TemporaryUserProfilePlugin());
-            userServices.AddPlugin(new OGS1UserDataPlugin(this));
-            
-            m_userService = userServices;
-            m_messageService = userServices;
-            m_avatarService = (IAvatarService)m_userService;
-        }
+            string avatarService = serverConfig.GetString("LocalServiceModule",
+                    String.Empty);
+
+            if (avatarService == String.Empty)
+                throw new Exception("No LocalServiceModule in config file");
 
+            Object[] args = new Object[] { config };
+            m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarService, args);
+
+            server.AddStreamHandler(new AvatarServerPostHandler(m_AvatarService));
+        }
     }
 }