ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Melanie
2009-08-07 03:05:46 +01:00
parent f8d8366bfa 53ba245967
commit e49abf446a
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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>";