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

Moving these nice HG connectors to their homes.

0.6.6-post-fixes
diva 2009-06-15 23:29:00 +00:00
parent 6cb7ecd99c
commit e1fd76ace6
4 changed files with 423 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Services/AssetService/HGAssetService.cs → OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
View File

@ -32,11 +32,10 @@ using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Services.Connectors;
namespace OpenSim.Services.AssetService namespace OpenSim.Services.Connectors
{ {
public class HGAssetService : IAssetService public class HGAssetServiceConnector : IAssetService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger( LogManager.GetLogger(
@ -44,7 +43,7 @@ namespace OpenSim.Services.AssetService
private Dictionary<string, AssetServicesConnector> m_connectors = new Dictionary<string, AssetServicesConnector>(); private Dictionary<string, AssetServicesConnector> m_connectors = new Dictionary<string, AssetServicesConnector>();
public HGAssetService(IConfigSource source) public HGAssetServiceConnector(IConfigSource source)
{ {
IConfig moduleConfig = source.Configs["Modules"]; IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null) if (moduleConfig != null)
@ -54,7 +53,7 @@ namespace OpenSim.Services.AssetService
IConfig assetConfig = source.Configs["AssetService"]; IConfig assetConfig = source.Configs["AssetService"];
if (assetConfig == null) if (assetConfig == null)
{ {
m_log.Error("[HG ASSET SERVICE]: AssetService missing from OpanSim.ini"); m_log.Error("[HG ASSET SERVICE]: AssetService missing from OpenSim.ini");
return; return;
} }

11
OpenSim/Services/InventoryService/HGInventoryService.cs → OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
View File

@ -32,12 +32,11 @@ using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenSim.Services.Connectors;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Services.InventoryService namespace OpenSim.Services.Connectors.Inventory
{ {
public class HGInventoryService : ISessionAuthInventoryService public class HGInventoryServiceConnector : ISessionAuthInventoryService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger( LogManager.GetLogger(
@ -45,14 +44,14 @@ namespace OpenSim.Services.InventoryService
private Dictionary<string, InventoryServicesConnector> m_connectors = new Dictionary<string, InventoryServicesConnector>(); private Dictionary<string, InventoryServicesConnector> m_connectors = new Dictionary<string, InventoryServicesConnector>();
public HGInventoryService(IConfigSource source) public HGInventoryServiceConnector(IConfigSource source)
{ {
IConfig moduleConfig = source.Configs["Modules"]; IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null) if (moduleConfig != null)
{ {
IConfig assetConfig = source.Configs["InventoryService"]; IConfig inventoryConfig = source.Configs["InventoryService"];
if (assetConfig == null) if (inventoryConfig == null)
{ {
m_log.Error("[HG INVENTORY SERVICE]: InventoryService missing from OpenSim.ini"); m_log.Error("[HG INVENTORY SERVICE]: InventoryService missing from OpenSim.ini");
return; return;

4
bin/config-include/GridHypergrid.ini
View File

@ -17,8 +17,8 @@
[AssetService] [AssetService]
LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService" HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
[InventoryService] [InventoryService]
LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector" LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService" HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"

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

@ -20,7 +20,7 @@
; For HGAssetBroker ; For HGAssetBroker
LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService" LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService" HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
[InventoryService] [InventoryService]
; For the InventoryServiceInConnector ; For the InventoryServiceInConnector
@ -28,4 +28,4 @@
; For HGInventoryBroker ; For HGInventoryBroker
LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService" HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"