aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-08-07 03:05:46 +0100
committerMelanie2009-08-07 03:05:46 +0100
commite49abf446aff77fb809a0222ad0adaf4b37f3cf9 (patch)
tree140251676b090bed41af22f87b804a6bd8bcf540 /OpenSim
parentRevert the XEngine memleak patch, it causes premature GC. (diff)
parentHGAuthenticationService must be a singleton, because it has in-memory state. ... (diff)
downloadopensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.zip
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.gz
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.bz2
opensim-SC_OLD-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/ISceneObject.cs1
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs4
-rw-r--r--OpenSim/Services/AuthenticationService/AuthenticationService.cs2
5 files changed, 13 insertions, 2 deletions
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
34 { 34 {
35 UUID UUID { get; } 35 UUID UUID { get; }
36 ISceneObject CloneForNewScene(); 36 ISceneObject CloneForNewScene();
37 string ToXml2();
37 string ExtraToXmlString(); 38 string ExtraToXmlString();
38 void ExtraFromXmlString(string xmlstr); 39 void ExtraFromXmlString(string xmlstr);
39 string GetStateSnapshot(); 40 string GetStateSnapshot();
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
99 if (!m_Registered) 99 if (!m_Registered)
100 { 100 {
101 m_Registered = true; 101 m_Registered = true;
102 new HGAuthServiceInConnector(m_Config, MainServer.Instance); 102 new HGAuthServiceInConnector(m_Config, MainServer.Instance, scene);
103 103
104 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; 104 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
105 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args); 105 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);
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;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
40using OpenSim.Region.Framework.Scenes.Serialization;
40 41
41namespace OpenSim.Region.Framework.Scenes 42namespace OpenSim.Region.Framework.Scenes
42{ 43{
@@ -3366,6 +3367,11 @@ namespace OpenSim.Region.Framework.Scenes
3366 return sog; 3367 return sog;
3367 } 3368 }
3368 3369
3370 public virtual string ToXml2()
3371 {
3372 return SceneObjectSerializer.ToXml2Format(this);
3373 }
3374
3369 public virtual string ExtraToXmlString() 3375 public virtual string ExtraToXmlString()
3370 { 3376 {
3371 return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; 3377 return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>";
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 @@
27 27
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework;
30using OpenSim.Server.Base; 31using OpenSim.Server.Base;
31using OpenSim.Services.Interfaces; 32using OpenSim.Services.Interfaces;
32using OpenSim.Framework.Servers.HttpServer; 33using OpenSim.Framework.Servers.HttpServer;
@@ -38,7 +39,7 @@ namespace OpenSim.Server.Handlers.Authentication
38 { 39 {
39 private IAuthenticationService m_AuthenticationService; 40 private IAuthenticationService m_AuthenticationService;
40 41
41 public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) : 42 public HGAuthServiceInConnector(IConfigSource config, IHttpServer server, IScene registry) :
42 base(config, server) 43 base(config, server)
43 { 44 {
44 IConfig serverConfig = config.Configs["AuthenticationService"]; 45 IConfig serverConfig = config.Configs["AuthenticationService"];
@@ -53,6 +54,7 @@ namespace OpenSim.Server.Handlers.Authentication
53 54
54 Object[] args = new Object[] { config }; 55 Object[] args = new Object[] { config };
55 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args); 56 m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
57 registry.RegisterModuleInterface<IAuthenticationService>(m_AuthenticationService);
56 58
57 HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService); 59 HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
58 server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod); 60 server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
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
83 83
84 m_PerformAuthentication = authConfig.GetBoolean("Authenticate", true); 84 m_PerformAuthentication = authConfig.GetBoolean("Authenticate", true);
85 m_AuthorityURL = "http://" + authConfig.GetString("Authority", "localhost"); 85 m_AuthorityURL = "http://" + authConfig.GetString("Authority", "localhost");
86 if (!m_AuthorityURL.EndsWith("/"))
87 m_AuthorityURL += "/";
86 } 88 }
87 89
88 // 90 //