OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

arthursv
Melanie 2009-08-07 03:05:46 +01:00
parent f8d8366bfa 53ba245967
commit e49abf446a
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/ISceneObject.cs
View File

@ -34,6 +34,7 @@ namespace OpenSim.Framework
{ {
UUID UUID { get; } UUID UUID { get; }
ISceneObject CloneForNewScene(); ISceneObject CloneForNewScene();
string ToXml2();
string ExtraToXmlString(); string ExtraToXmlString();
void ExtraFromXmlString(string xmlstr); void ExtraFromXmlString(string xmlstr);
string GetStateSnapshot(); string GetStateSnapshot();

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
View File

@ -99,7 +99,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
if (!m_Registered) if (!m_Registered)
{ {
m_Registered = true; 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 }; //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
//ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args); //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);

6
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -37,6 +37,7 @@ using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using OpenSim.Region.Framework.Scenes.Serialization;
namespace OpenSim.Region.Framework.Scenes namespace OpenSim.Region.Framework.Scenes
{ {
@ -3366,6 +3367,11 @@ namespace OpenSim.Region.Framework.Scenes
return sog; return sog;
} }
public virtual string ToXml2()
{
return SceneObjectSerializer.ToXml2Format(this);
}
public virtual string ExtraToXmlString() public virtual string ExtraToXmlString()
{ {
return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>";

4
OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
View File

@ -27,6 +27,7 @@
using System; using System;
using Nini.Config; using Nini.Config;
using OpenSim.Framework;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
@ -38,7 +39,7 @@ namespace OpenSim.Server.Handlers.Authentication
{ {
private IAuthenticationService m_AuthenticationService; private IAuthenticationService m_AuthenticationService;
public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) : public HGAuthServiceInConnector(IConfigSource config, IHttpServer server, IScene registry) :
base(config, server) base(config, server)
{ {
IConfig serverConfig = config.Configs["AuthenticationService"]; IConfig serverConfig = config.Configs["AuthenticationService"];
@ -53,6 +54,7 @@ namespace OpenSim.Server.Handlers.Authentication
Object[] args = new Object[] { config }; Object[] args = new Object[] { config };
m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args); m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
registry.RegisterModuleInterface<IAuthenticationService>(m_AuthenticationService);
HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService); HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod); server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);

2
OpenSim/Services/AuthenticationService/AuthenticationService.cs
View File

@ -83,6 +83,8 @@ namespace OpenSim.Services.AuthenticationService
m_PerformAuthentication = authConfig.GetBoolean("Authenticate", true); m_PerformAuthentication = authConfig.GetBoolean("Authenticate", true);
m_AuthorityURL = "http://" + authConfig.GetString("Authority", "localhost"); m_AuthorityURL = "http://" + authConfig.GetString("Authority", "localhost");
if (!m_AuthorityURL.EndsWith("/"))
m_AuthorityURL += "/";
} }
// //