Folded HG regionhandle lookup into the normal RESTInterregionComms, to avoid proliferation of "modes".
diva
parent
5de40aaf46
commit
12946b5d78
|
|
@ -1,87 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSim Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
using System;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Reflection;
|
|
||||||
using log4net;
|
|
||||||
using Nini.Config;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Framework.Communications;
|
|
||||||
using OpenSim.Framework.Communications.Cache;
|
|
||||||
using OpenSim.Region.Environment.Interfaces;
|
|
||||||
using OpenSim.Region.Interfaces;
|
|
||||||
using OpenSim.Region.Environment.Scenes;
|
|
||||||
using OpenSim.Region.Environment.Scenes.Hypergrid;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.Environment.Modules.Communications.REST
|
|
||||||
{
|
|
||||||
public class HGInterregionComms : RESTInterregionComms
|
|
||||||
{
|
|
||||||
private static bool initialized = false;
|
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
|
||||||
|
|
||||||
#region IRegionModule
|
|
||||||
|
|
||||||
public override void Initialise(Scene scene, IConfigSource config)
|
|
||||||
{
|
|
||||||
if (!initialized)
|
|
||||||
{
|
|
||||||
initialized = true;
|
|
||||||
IConfig startupConfig = config.Configs["Communications"];
|
|
||||||
if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms"))
|
|
||||||
{
|
|
||||||
m_log.Debug("[HGREST COMMS]: Enabling InterregionComms HGRESTComms module");
|
|
||||||
m_enabled = true;
|
|
||||||
InitOnce(scene);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!m_enabled)
|
|
||||||
return;
|
|
||||||
|
|
||||||
InitEach(scene);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string Name
|
|
||||||
{
|
|
||||||
get { return "HGInterregionCommsModule"; }
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion /* IRegionModule */
|
|
||||||
|
|
||||||
#region Misc
|
|
||||||
|
|
||||||
protected override ulong GetRegionHandle(RegionInfo region)
|
|
||||||
{
|
|
||||||
return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.FindRegionHandle(region.RegionHandle);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion /* Misc */
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -44,6 +44,7 @@ using OpenSim.Framework.Communications.Cache;
|
||||||
using OpenSim.Region.Environment.Interfaces;
|
using OpenSim.Region.Environment.Interfaces;
|
||||||
using OpenSim.Region.Interfaces;
|
using OpenSim.Region.Interfaces;
|
||||||
using OpenSim.Region.Environment.Scenes;
|
using OpenSim.Region.Environment.Scenes;
|
||||||
|
using OpenSim.Region.Environment.Scenes.Hypergrid;
|
||||||
using OpenSim.Region.Environment.Modules.Communications.Local;
|
using OpenSim.Region.Environment.Modules.Communications.Local;
|
||||||
|
|
||||||
namespace OpenSim.Region.Environment.Modules.Communications.REST
|
namespace OpenSim.Region.Environment.Modules.Communications.REST
|
||||||
|
|
@ -291,6 +292,9 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
|
||||||
|
|
||||||
protected virtual ulong GetRegionHandle(RegionInfo region)
|
protected virtual ulong GetRegionHandle(RegionInfo region)
|
||||||
{
|
{
|
||||||
|
if (m_aScene.SceneGridService is HGSceneCommunicationService)
|
||||||
|
return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.FindRegionHandle(region.RegionHandle);
|
||||||
|
|
||||||
return region.RegionHandle;
|
return region.RegionHandle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -183,7 +183,6 @@
|
||||||
|
|
||||||
;InterregionComms = "LocalComms"
|
;InterregionComms = "LocalComms"
|
||||||
InterregionComms = "RESTComms"
|
InterregionComms = "RESTComms"
|
||||||
;InterregionComms = "HGRESTComms"
|
|
||||||
|
|
||||||
[StandAlone]
|
[StandAlone]
|
||||||
accounts_authenticate = true
|
accounts_authenticate = true
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue