From ea940d98f91b65e0fdc0619bc4e421d506813870 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 6 Aug 2009 16:41:24 -0700
Subject: Added ToXml2() to ISceneObject, so that components other than regions
 can use this abstraction.

---
 OpenSim/Framework/ISceneObject.cs                   | 1 +
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index 14a338e..db19527 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Framework
     {
         UUID UUID { get; }            
         ISceneObject CloneForNewScene();
+        string ToXml2();
         string ExtraToXmlString();
         void ExtraFromXmlString(string xmlstr);
         string GetStateSnapshot();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 21e133b..c86e4a1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -37,6 +37,7 @@ using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -3366,6 +3367,11 @@ namespace OpenSim.Region.Framework.Scenes
             return sog;
         }
 
+        public virtual string ToXml2()
+        {
+            return SceneObjectSerializer.ToXml2Format(this);
+        }
+
         public virtual string ExtraToXmlString()
         {
             return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>";
-- 
cgit v1.1


From 11c698af67e73230ca0806ee12d4845a06b11479 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 6 Aug 2009 17:42:28 -0700
Subject: Added missing trailing slash in AuthenticationService.

---
 OpenSim/Services/AuthenticationService/AuthenticationService.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Services/AuthenticationService/AuthenticationService.cs b/OpenSim/Services/AuthenticationService/AuthenticationService.cs
index 3e6c3b2..b81a004 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationService.cs
@@ -83,6 +83,8 @@ namespace OpenSim.Services.AuthenticationService
 
                 m_PerformAuthentication = authConfig.GetBoolean("Authenticate", true);
                 m_AuthorityURL = "http://" + authConfig.GetString("Authority", "localhost");
+                if (!m_AuthorityURL.EndsWith("/"))
+                    m_AuthorityURL += "/";
             }
 
             //
-- 
cgit v1.1


From 53ba245967c58f574f58b1d99e077f30985ee7ad Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 6 Aug 2009 18:43:53 -0700
Subject: HGAuthenticationService must be a singleton, because it has in-memory
 state. This makes this singleton register with IScene, so that other parts
 can retrieve its reference.

---
 .../Authentication/HGAuthServiceInConnectorModule.cs                  | 2 +-
 OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
index f4ebc70..6f2371d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
             if (!m_Registered)
             {
                 m_Registered = true;
-                new HGAuthServiceInConnector(m_Config, MainServer.Instance);
+                new HGAuthServiceInConnector(m_Config, MainServer.Instance, scene);
 
                 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
                 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);
diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
index 2d31564..f4f8309 100644
--- a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
@@ -27,6 +27,7 @@
 
 using System;
 using Nini.Config;
+using OpenSim.Framework;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
@@ -38,7 +39,7 @@ namespace OpenSim.Server.Handlers.Authentication
     {
         private IAuthenticationService m_AuthenticationService;
 
-        public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) :
+        public HGAuthServiceInConnector(IConfigSource config, IHttpServer server, IScene registry) :
                 base(config, server)
         {
             IConfig serverConfig = config.Configs["AuthenticationService"];
@@ -53,6 +54,7 @@ namespace OpenSim.Server.Handlers.Authentication
 
             Object[] args = new Object[] { config };
             m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
+            registry.RegisterModuleInterface<IAuthenticationService>(m_AuthenticationService);
 
             HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
             server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
-- 
cgit v1.1