diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
2 files changed, 7 insertions, 1 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 | |||
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; | |||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
40 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.Framework.Scenes | 42 | namespace 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>"; |