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

Removing the OpenSim.SimulatorServices project. All of those region modules are now in CoreModules/ServiceConnectorsIn, where they belong.

0.6.6-post-fixes
diva 2009-06-15 00:17:17 +00:00
parent 380f59d0ff
commit 54d44e370b
9 changed files with 488 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
View File

@ -30,6 +30,12 @@
<RegionModule id="RemoteNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.RemoteNeighbourServicesConnector" />
<RegionModule id="LocalLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.LocalLandServicesConnector" />
<RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" />
<!-- Service connectors IN modules -->
<RegionModule id="RegionAssetService" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.RegionAssetService" />
<RegionModule id="RegionInventoryService" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.RegionInventoryService" />
<RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
<RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
</Extension>
<Extension path = "/OpenSim/WindModule">

26
OpenSim/SimulatorServices/RegionAssetService.cs → OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs
View File

@ -37,12 +37,12 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base;
namespace OpenSim.SimulatorServices
namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
{
public class RegionAssetService : ISharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool enabled = false;
private static bool m_Enabled = false;
private IConfigSource m_Config;
bool m_Registered = false;
@ -51,12 +51,22 @@ namespace OpenSim.SimulatorServices
public void Initialise(IConfigSource config)
{
// This module is only on for standalones in hypergrid mode
enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled);
//// This module is only on for standalones in hypergrid mode
//enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
// config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
// ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
//m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled);
m_Config = config;
IConfig moduleConfig = config.Configs["Modules"];
if (moduleConfig != null)
{
m_Enabled = moduleConfig.GetBoolean("AssetServiceInConnector", false);
if (m_Enabled)
{
m_log.Info("[ASSET IN CONNECTOR]: AssetServiceInConnector enabled");
}
}
}
public void PostInitialise()
@ -74,7 +84,7 @@ namespace OpenSim.SimulatorServices
public void AddRegion(Scene scene)
{
if (!enabled)
if (!m_Enabled)
return;
if (!m_Registered)

25
OpenSim/SimulatorServices/RegionInventoryService.cs → OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs
View File

@ -37,12 +37,12 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base;
namespace OpenSim.SimulatorServices
namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
{
public class RegionInventoryService : ISharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool enabled = false;
private static bool m_Enabled = false;
private IConfigSource m_Config;
bool m_Registered = false;
@ -51,11 +51,22 @@ namespace OpenSim.SimulatorServices
public void Initialise(IConfigSource config)
{
// This module is only on for standalones in hypergrid mode
enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
config.Configs["Startup"].GetBoolean("hypergrid", true);
m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
//// This module is only on for standalones in hypergrid mode
//enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
// config.Configs["Startup"].GetBoolean("hypergrid", true);
//m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
m_Config = config;
IConfig moduleConfig = config.Configs["Modules"];
if (moduleConfig != null)
{
m_Enabled = moduleConfig.GetBoolean("InventoryServiceInConnector", false);
if (m_Enabled)
{
m_log.Info("[INVENTORY IN CONNECTOR]: Inventory Service In Connector enabled");
}
}
}
public void PostInitialise()
@ -73,7 +84,7 @@ namespace OpenSim.SimulatorServices
public void AddRegion(Scene scene)
{
if (!enabled)
if (!m_Enabled)
return;
if (!m_Registered)

2
OpenSim/SimulatorServices/LandServiceInConnectorModule.cs → OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
View File

@ -39,7 +39,7 @@ using OpenSim.Server.Handlers.Base;
using OpenSim.Services.Interfaces;
namespace OpenSim.SimulatorServices
namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
{
public class LandServiceInConnectorModule : ISharedRegionModule, ILandService
{

2
OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs → OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
View File

@ -39,7 +39,7 @@ using OpenSim.Server.Handlers.Base;
using OpenSim.Services.Interfaces;
namespace OpenSim.SimulatorServices
namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
{
public class NeighbourServiceInConnectorModule : ISharedRegionModule, INeighbourService
{

5
OpenSim/SimulatorServices/SimulationService.cs → OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
View File

@ -38,9 +38,10 @@ using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base;
namespace OpenSim.SimulatorServices
namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
{
public class SimulationService : ISharedRegionModule
// Under construction
public class SimulationServiceInConnectorModule : ISharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool m_Enabled = false;

17
OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml
View File

@ -1,17 +0,0 @@
<Addin id="OpenSim.SimulatorServices" version="0.2">
<Runtime>
<Import assembly="OpenSim.SimulatorServices.dll"/>
</Runtime>
<Dependencies>
<Addin id="OpenSim" version="0.5" />
</Dependencies>
<Extension path = "/OpenSim/RegionModules">
<RegionModule id="RegionAssetService" type="OpenSim.SimulatorServices.RegionAssetService" />
<RegionModule id="RegionInventoryService" type="OpenSim.SimulatorServices.RegionInventoryService" />
<RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.SimulatorServices.NeighbourServiceInConnectorModule" />
<RegionModule id="LandServiceInConnectorModule" type="OpenSim.SimulatorServices.LandServiceInConnectorModule" />
</Extension>
</Addin>

6
bin/config-include/StandaloneHypergrid.ini
View File

@ -11,9 +11,11 @@
AssetServices = "HGAssetBroker"
InventoryServices = "HGInventoryBroker"
NeighbourServices = "LocalNeighbourServicesConnector"
InventoryServiceInConnector = true
AssetServiceInConnector = true
[AssetService]
; For the RegionAssetService
; For the AssetServiceInConnector
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
; For HGAssetBroker
@ -21,7 +23,7 @@
HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
[InventoryService]
; For the RegionInventoryService
; For the InventoryServiceInConnector
LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
; For HGInventoryBroker

36
prebuild.xml
View File

@ -1547,6 +1547,7 @@
<Reference name="OpenSim.Data" />
<Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Server.Base" />
<Reference name="OpenSim.Server.Handlers" />
<Reference name="OpenSim.Services.Connectors" />
<Reference name="OpenSim.Services.Base" />
<Reference name="OpenSim.Services.Interfaces" />
@ -1657,41 +1658,6 @@
</Files>
</Project>
<Project name="OpenSim.SimulatorServices" path="OpenSim/SimulatorServices" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.Servers.HttpServer" />
<Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Server.Handlers"/>
<Reference name="Mono.Addins.dll" />
<Reference name="XMLRPC.dll"/>
<Reference name="Nini.dll" />
<Reference name="log4net.dll"/>
<Files>
<Match pattern="*.cs" recurse="true">
<Exclude name="Tests" pattern="Tests" />
</Match>
<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
</Files>
</Project>
<Project name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
<Configuration name="Debug">
<Options>