zontreck/OpenSim-Sasquatch
1
0
Fork 0
mirror of https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git synced 2024-11-21 06:26:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dont use the addins xml definitions for CoreModules just yet. Need to rationalize all the modules names against the config files to verify modules are loaded correctly. We're using the old style Assembly information for now which matches up with the annotations in the files.

Browse source
This commit is contained in:
Mike Dickson 2023-01-24 13:15:09 -05:00
parent 265f211906
commit bd92eb1dd7
14 changed files with 138 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
View file

@ -45,7 +45,7 @@ using Mono.Addins;
namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XBakes.Module")]
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XBakesModule")]
public class XBakesModule : INonSharedRegionModule, IBakedTextureModule
{
protected Scene m_Scene;
@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
public string Name
{
get { return "XBakes.Module"; }
get { return "XBakesModule"; }
}
public Type ReplaceableInterface

4
OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
View file

@ -40,7 +40,7 @@ using PermissionMask = OpenSim.Framework.PermissionMask;
namespace OpenSim.Region.CoreModules.Avatar.Friends
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XCallingCard")]
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CallingCardModule")]
public class CallingCardModule : ISharedRegionModule, ICallingCardModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
public string Name
{
get { return "XCallingCardModule"; }
get { return "CallingCardModule"; }
}
private void OnNewClient(IClientAPI client)

2
OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
View file

@ -39,7 +39,7 @@ using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DAExampleModule")]
public class DAExampleModule : INonSharedRegionModule

3
OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
View file

@ -36,11 +36,10 @@ using OpenMetaverse.Packets;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes
{
/// <summary>
/// Example module for experimenting with and demonstrating dynamic object ideas.

4
OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
View file

@ -39,9 +39,9 @@ using OpenSim.Framework.Monitoring;
using OpenSim.Region.Framework.Scenes;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
namespace OpenSim.Region.CoreModules.Framework
namespace OpenSim.Region.CoreModules.Framework.ServiceThrottle
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GridServiceThrottleModule")]
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ServiceThrottleModule")]
public class ServiceThrottleModule : ISharedRegionModule, IServiceThrottleModule
{
private static readonly ILog m_log = LogManager.GetLogger(

4
OpenSim/Region/CoreModules/OpenSim.Region.CoreModules.csproj
View file

@ -97,9 +97,9 @@
<Compile Remove="Avatar\Inventory\Transfer\Tests\InventoryTransferModuleTests.cs" />
<Compile Remove="World\Media\Moap\Tests\MoapTests.cs" />
</ItemGroup>
<ItemGroup>
<!-- <ItemGroup>
<EmbeddedResource Include="Resources\OpenSim.Region.CoreModules.addin.xml" />
</ItemGroup>
</ItemGroup> -->
<ItemGroup>
<PackageReference Include="Ionic.Zlib.Core" Version="1.0.0" />
<PackageReference Include="log4net" Version="2.0.15" />

238
OpenSim/Region/CoreModules/Resources/OpenSim.Region.CoreModules.addin.xml
View file

@ -14,125 +14,127 @@
</ExtensionPoint>
<Extension path = "/OpenSim/RegionModules">
<RegionModule id="DefaultPermissionsModule" class="OpenSim.Region.CoreModules.World.Permissions.DefaultPermissionsModule" />
<RegionModule id="AssetTransactionModule" class="OpenSim.Region.CoreModules.Agent.AssetTransaction.AssetTransactionModule" />
<RegionModule id="IPBanModule" class="OpenSim.Region.CoreModules.Agent.IPBan.IPBanModule" />
<RegionModule id="J2KDecoderModule" class="OpenSim.Region.CoreModules.Agent.TextureSender.J2KDecoderModule" />
<RegionModule id="XferModule" class="OpenSim.Region.CoreModules.Agent.Xfer.XferModule" />
<RegionModule id="FlotsamAssetCache" class="OpenSim.Region.CoreModules.Asset.FlotsamAssetCache" />
<RegionModule id="AttachmentsModule" class="OpenSim.Region.CoreModules.Avatar.Attachments.AttachmentsModule" />
<RegionModule id="AvatarFactoryModule" class="OpenSim.Region.CoreModules.Avatar.AvatarFactory.AvatarFactoryModule" />
<RegionModule id="XBakesModule" class="OpenSim.Region.CoreModules.Avatar.BakedTextures.XBakesModule" />
<RegionModule id="ChatModule" class="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" />
<RegionModule id="CombatModule" class="OpenSim.Region.CoreModules.Avatar.Combat.CombatModule.CombatModule" />
<RegionModule id="UserCommandsModule" class="OpenSim.Region.CoreModules.Avatars.Commands.UserCommandsModule" />
<RegionModule id="DialogModule" class="OpenSim.Region.CoreModules.Avatar.Dialog.DialogModule" />
<RegionModule id="CallingCardModule" class="OpenSim.Region.CoreModules.Avatar.Friends.CallingCardModule" />
<RegionModule id="FriendsModule" class="OpenSim.Region.CoreModules.Avatar.Friends.FriendsModule" />
<RegionModule id="HGFriendsModule" class="OpenSim.Region.CoreModules.Avatar.Friends.HGFriendsModule" />
<RegionModule id="GesturesModule" class="OpenSim.Region.CoreModules.Avatar.Gestures.GesturesModule" />
<RegionModule id="GodsModule" class="OpenSim.Region.CoreModules.Avatar.Gods.GodsModule" />
<RegionModule id="GroupsModule" class="OpenSim.Region.CoreModules.Avatar.Groups.GroupsModule" />
<RegionModule id="HGMessageTransferModule" class="OpenSim.Region.CoreModules.Avatar.InstantMessage.HGMessageTransferModule" />
<RegionModule id="InstantMessageModule" class="OpenSim.Region.CoreModules.Avatar.InstantMessage.InstantMessageModule" />
<RegionModule id="MessageTransferModule" class="OpenSim.Region.CoreModules.Avatar.InstantMessage.MessageTransferModule" />
<RegionModule id="MuteListModule" class="OpenSim.Region.CoreModules.Avatar.InstantMessage.MuteListModule" />
<RegionModule id="OfflineMessageModule" class="OpenSim.Region.CoreModules.Avatar.InstantMessage.OfflineMessageModule" />
<RegionModule id="PresenceModule" class="OpenSim.Region.CoreModules.Avatar.InstantMessage.PresenceModule" />
<RegionModule id="InventoryArchiverModule" class="OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.InventoryArchiverModule" />
<RegionModule id="InventoryTransferModule" class="OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.InventoryTransferModule" />
<RegionModule id="HGLureModule" class="OpenSim.Region.CoreModules.Avatar.Lure.HGLureModule" />
<RegionModule id="LureModule" class="OpenSim.Region.CoreModules.Avatar.Lure.LureModule" />
<RegionModule id="BasicProfileModule" class="OpenSim.Region.CoreModules.Avatar.Profile.BasicProfileModule" />
<RegionModule id="UserProfilesModule" class="OpenSim.Region.CoreModules.Avatar.UserProfiles.UserProfilesModule" />
<RegionModule id="CapabilitiesModule" class="OpenSim.Region.CoreModules.Framework.CapabilitiesModule" />
<RegionModule id="DAExampleModule" class="OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule" />
<RegionModule id="DOExampleModule" class="OpenSim.Region.CoreModules.Framework.DynamicAttributes.DOExampleModule" />
<RegionModule id="EntityTransferModule" class="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
<RegionModule id="HGEntityTransferModule" class="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
<RegionModule id="HGInventoryAccessModule" class="OpenSim.Region.CoreModules.Framework.InventoryAccess.HGInventoryAccessModule" />
<RegionModule id="BasicInventoryAccessModule" class="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />
<RegionModule id="LibraryModule" class="penSim.Region.CoreModules.Framework.Library.LibraryModule" />
<RegionModule id="MonitorModule" class="OpenSim.Region.CoreModules.Framework.Monitoring.MonitorModule" />
<RegionModule id="BasicSearchModule" class="OpenSim.Region.CoreModules.Framework.Search.BasicSearchModule" />
<RegionModule id="ServiceThrottleModule" class="OpenSim.Region.CoreModules.Framework.ServiceThrottle.ServiceThrottleModule" />
<RegionModule id="HGUserManagementModule" class="OpenSim.Region.CoreModules.Framework.UserManagement.HGUserManagementModule" />
<RegionModule id="UserManagementModule" class="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
<RegionModule id="DynamicTextureModule" class="OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTextureModule" />
<RegionModule id="EmailModule" class="OpenSim.Region.CoreModules.Scripting.EmailModules.EmailModule" />
<RegionModule id="HttpRequestModule" class="OpenSim.Region.CoreModules.Scripting.HttpRequest.HttpRequestModule" />
<RegionModule id="LoadImageURLModule" class="OpenSim.Region.CoreModules.Scripting.LoadImageURL.LoadImageURLModule" />
<RegionModule id="UrlModule" class="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" />
<RegionModule id="ScriptModuleCommsModule" class="OpenSim.Region.CoreModules.Scripting.ScriptModuleComms.ScriptModuleCommsModule" />
<RegionModule id="VectorRenderModule" class="OpenSim.Region.CoreModules.Scripting.VectorRender.VectorRenderModule" />
<RegionModule id="WorldCommModule" class="OpenSim.Region.CoreModules.Scripting.WorldComm.WorldCommModule" />
<RegionModule id="XMLRPCModule" class="OpenSim.Region.CoreModules.Scripting.XMLRPC.XMLRPCModule" />
<RegionModule id="AssetServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
<RegionModule id="AuthenticationServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.AuthenticationServiceInConnectorModule" />
<RegionModule id="GridInfoServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.GridInfoServiceInConnectorModule" />
<RegionModule id="HypergridServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid.HypergridServiceInConnectorModule" />
<RegionModule id="InventoryServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
<RegionModule id="LandServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
<RegionModule id="LLLoginServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Login.LLLoginServiceInConnectorModule" />
<RegionModule id="MapImageServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage.MapImageServiceInConnectorModule" />
<RegionModule id="NeighbourServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" />
<RegionModule id="SimulationServiceInConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation.SimulationServiceInConnectorModule" />
<RegionModule id="LocalUserProfilesServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile.LocalUserProfilesServicesConnector" />
<RegionModule id="LocalAgentPreferencesServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences.LocalAgentPreferencesServicesConnector" />
<RegionModule id="RemoteAgentPreferencesServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences.RemoteAgentPreferencesServicesConnector" />
<RegionModule id="LocalAssetServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
<RegionModule id="RegionAssetConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RegionAssetConnector" />
<RegionModule id="LocalAuthenticationServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication.LocalAuthenticationServicesConnector" />
<RegionModule id="RemoteAuthenticationServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication.RemoteAuthenticationServicesConnector" />
<RegionModule id="LocalAuthorizationServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.LocalAuthorizationServicesConnector" />
<RegionModule id="RemoteAuthorizationServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" />
<RegionModule id="LocalAvatarServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar.LocalAvatarServicesConnector" />
<RegionModule id="RemoteAvatarServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar.RemoteAvatarServicesConnector" />
<RegionModule id="RegionGridServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RegionGridServicesConnector" />
<RegionModule id="LocalGridUserServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.LocalGridUserServicesConnector" />
<RegionModule id="RemoteGridUserServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.RemoteGridUserServicesConnector" />
<RegionModule id="HGInventoryBroker" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.HGInventoryBroker" />
<RegionModule id="LocalInventoryServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.LocalInventoryServicesConnector" />
<RegionModule id="RemoteXInventoryServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteXInventoryServicesConnector" />
<RegionModule id="UserCommandsModule" class="UserCommandsModule" />
<RegionModule id="XCallingCard" class="XCallingCard" />
<RegionModule id="HGFriendsModule" class="HGFriendsModule" />
<RegionModule id="FriendsModule" class="FriendsModule" />
<RegionModule id="DialogModule" class="DialogModule" />
<RegionModule id="GroupsModule" class="GroupsModule" />
<RegionModule id="ChatModule" class="ChatModule" />
<RegionModule id="MessageTransferModule" class="MessageTransferModule" />
<RegionModule id="OfflineMessageModule" class="OfflineMessageModule" />
<RegionModule id="InstantMessageModule" class="InstantMessageModule" />
<RegionModule id="PresenceModule" class="PresenceModule" />
<RegionModule id="HGMessageTransferModule" class="HGMessageTransferModule" />
<RegionModule id="MuteListModule" class="MuteListModule" />
<RegionModule id="XBakes.Module" class="XBakes.Module" />
<RegionModule id="CombatModule" class="CombatModule" />
<RegionModule id="InventoryArchiverModule" class="InventoryArchiverModule" />
<RegionModule id="InventoryTransferModule" class="InventoryTransferModule" />
<RegionModule id="BasicProfileModule" class="BasicProfileModule" />
<RegionModule id="AvatarFactoryModule" class="AvatarFactoryModule" />
<RegionModule id="GodsModule" class="GodsModule" />
<RegionModule id="AttachmentsModule" class="AttachmentsModule" />
<RegionModule id="LureModule" class="LureModule" />
<RegionModule id="HGLureModule" class="HGLureModule" />
<RegionModule id="UserProfilesModule" class="UserProfilesModule" />
<RegionModule id="GesturesModule" class="GesturesModule" />
<RegionModule id="EnvironmentModule" class="EnvironmentModule" />
<RegionModule id="EstateManagementModule" class="EstateManagementModule" />
<RegionModule id="EstateModule" class="EstateModule" />
<RegionModule id="ArchiverModule" class="ArchiverModule" />
<RegionModule id="SoundModule" class="SoundModule" />
<RegionModule id="PrimCountModule" class="PrimCountModule" />
<RegionModule id="DefaultDwellModule" class="DefaultDwellModule" />
<RegionModule id="LandManagementModule" class="LandManagementModule" />
<RegionModule id="VegetationModule" class="VegetationModule" />
<RegionModule id="MoapModule" class="MoapModule" />
<RegionModule id="WindModule" class="WindModule" />
<RegionModule id="ConfigurableWind" class="ConfigurableWind" />
<RegionModule id="SimpleRandomWind" class="SimpleRandomWind" />
<RegionModule id="RestartModule" class="RestartModule" />
<RegionModule id="RegionCommandsModule" class="RegionCommandsModule" />
<RegionModule id="MapSearchModule" class="MapSearchModule" />
<RegionModule id="HGWorldMapModule" class="HGWorldMapModule" />
<RegionModule id="WorldMapModule" class="WorldMapModule" />
<RegionModule id="SerialiserModule" class="SerialiserModule" />
<RegionModule id="MapImageModule" class="MapImageModule" />
<RegionModule id="AccessModule" class="AccessModule" />
<RegionModule id="BuySellModule" class="BuySellModule" />
<RegionModule id="ObjectCommandsModule" class="ObjectCommandsModule" />
<RegionModule id="Warp3DImageModule" class="Warp3DImageModule" />
<RegionModule id="DefaultPermissionsModule" class="DefaultPermissionsModule" />
<RegionModule id="TerrainModule" class="TerrainModule" />
<RegionModule id="LoadImageURLModule" class="LoadImageURLModule" />
<RegionModule id="VectorRenderModule" class="VectorRenderModule" />
<RegionModule id="HttpRequestModule" class="HttpRequestModule" />
<RegionModule id="XMLRPCModule" class="XMLRPCModule" />
<RegionModule id="EmailModule" class="EmailModule" />
<RegionModule id="DynamicTextureModule" class="DynamicTextureModule" />
<RegionModule id="UrlModule" class="UrlModule" />
<RegionModule id="ScriptModuleCommsModule" class="ScriptModuleCommsModule" />
<RegionModule id="SimulationServiceInConnectorModule" class="SimulationServiceInConnectorModule" />
<RegionModule id="LandServiceInConnectorModule" class="LandServiceInConnectorModule" />
<RegionModule id="MapImageServiceInConnectorModule" class="MapImageServiceInConnectorModule" />
<RegionModule id="LLLoginServiceInConnectorModule" class="LLLoginServiceInConnectorModule" />
<RegionModule id="HypergridServiceInConnectorModule" class="HypergridServiceInConnectorModule" />
<RegionModule id="AuthenticationServiceInConnectorModule" class="AuthenticationServiceInConnectorModule" />
<RegionModule id="NeighbourServiceInConnectorModule" class="NeighbourServiceInConnectorModule" />
<RegionModule id="InventoryServiceInConnectorModule" class="InventoryServiceInConnectorModule" />
<RegionModule id="AssetServiceInConnectorModule" class="AssetServiceInConnectorModule" />
<RegionModule id="GridInfoServiceInConnectorModule" class="GridInfoServiceInConnectorModule" />
<RegionModule id="LocalUserProfilesServicesConnector" class="LocalUserProfilesServicesConnector" />
<RegionModule id="RemoteUserAccountServicesConnector" class="RemoteUserAccountServicesConnector" />
<RegionModule id="LocalUserAccountServicesConnector" class="LocalUserAccountServicesConnector" />
<RegionModule id="RemoteSimulationConnectorModule" class="RemoteSimulationConnectorModule" />
<RegionModule id="LocalSimulationConnectorModule" class="LocalSimulationConnectorModule" />
<RegionModule id="RemoteLandServicesConnector" class="RemoteLandServicesConnector" />
<RegionModule id="LocalLandServicesConnector" class="LocalLandServicesConnector" />
<RegionModule id="MapImageServiceModule" class="MapImageServiceModule" />
<RegionModule id="LocalPresenceServicesConnector" class="LocalPresenceServicesConnector" />
<RegionModule id="RemotePresenceServicesConnector" class="RemotePresenceServicesConnector" />
<RegionModule id="RemoteAvatarServicesConnector" class="RemoteAvatarServicesConnector" />
<RegionModule id="LocalAvatarServicesConnector" class="LocalAvatarServicesConnector" />
<RegionModule id="LocalAuthenticationServicesConnector" class="LocalAuthenticationServicesConnector" />
<RegionModule id="RemoteAuthenticationServicesConnector" class="RemoteAuthenticationServicesConnector" />
<RegionModule id="LocalAuthorizationServicesConnector" class="LocalAuthorizationServicesConnector" />
<RegionModule id="RemoteAuthorizationServicesConnector" class="RemoteAuthorizationServicesConnector" />
<RegionModule id="RemoteMuteListServicesConnector" class="RemoteMuteListServicesConnector" />
<RegionModule id="LocalMuteListServicesConnector" class="LocalMuteListServicesConnector" />
<RegionModule id="LocalGridUserServicesConnector" class="LocalGridUserServicesConnector" />
<RegionModule id="RemoteGridUserServicesConnector" class="RemoteGridUserServicesConnector" />
<RegionModule id="RemoteAgentPreferencesServicesConnector" class="RemoteAgentPreferencesServicesConnector" />
<RegionModule id="LocalAgentPreferencesServicesConnector" class="LocalAgentPreferencesServicesConnector" />
<RegionModule id="NeighbourServicesOutConnector" class="NeighbourServicesOutConnector" />
<RegionModule id="LocalInventoryServicesConnector" class="LocalInventoryServicesConnector" />
<RegionModule id="HGInventoryBroker" class="HGInventoryBroker" />
<RegionModule id="LocalAssetServicesConnector" class="LocalAssetServicesConnector" />
<RegionModule id="RegionAssetConnector" class="RegionAssetConnector" />
<RegionModule id="LocalUserAliasServicesConnector" class="LocalUserAliasServicesConnector" />
<RegionModule id="RemoteUserAliasServicesConnector" class="RemoteUserAliasServicesConnector" />
<RegionModule id="RegionGridServicesConnector" class="RegionGridServicesConnector" />
<RegionModule id="HGEntityTransferModule" class="HGEntityTransferModule" />
<RegionModule id="EntityTransferModule" class="EntityTransferModule" />
<RegionModule id="CapabilitiesModule" class="CapabilitiesModule" />
<RegionModule id="MonitorModule" class="MonitorModule" />
<RegionModule id="HGUserManagementModule" class="HGUserManagementModule" />
<RegionModule id="UserManagementModule" class="UserManagementModule" />
<RegionModule id="BasicSearchModule" class="BasicSearchModule" />
<RegionModule id="DAExampleModule" class="DAExampleModule" />
<RegionModule id="DOExampleModule" class="DOExampleModule" />
<RegionModule id="HGInventoryAccessModule" class="HGInventoryAccessModule" />
<RegionModule id="BasicInventoryAccessModule" class="BasicInventoryAccessModule" />
<RegionModule id="GridServiceThrottleModule" class="GridServiceThrottleModule" />
<RegionModule id="LibraryModule" class="LibraryModule" />
<RegionModule id="FlotsamAssetCache" class="FlotsamAssetCache" />
<RegionModule id="IPBanModule" class="IPBanModule" />
<RegionModule id="AssetTransactionModule" class="AssetTransactionModule" />
<RegionModule id="XferModule" class="XferModule" />
<RegionModule id="J2KDecoderModule" class="J2KDecoderModule" />
<RegionModule id="LocalLandServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.LocalLandServicesConnector" />
<RegionModule id="RemoteLandServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" />
<RegionModule id="MapImageServiceModule" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage.MapImageServiceModule" />
<RegionModule id="LocalMuteListServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.MuteList.LocalMuteListServicesConnector" />
<RegionModule id="RemoteMuteListServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.MuteList.RemoteMuteListServicesConnector" />
<RegionModule id="NeighbourServicesOutConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.NeighbourServicesOutConnector" />
<RegionModule id="LocalPresenceServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.LocalPresenceServicesConnector" />
<RegionModule id="RemotePresenceServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
<RegionModule id="LocalSimulationConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
<RegionModule id="RemoteSimulationConnectorModule" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
<RegionModule id="LocalUserAccountServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
<RegionModule id="RemoteUserAccountServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
<RegionModule id="LocalUserAliasServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAliases.LocalUserAliasServicesConnector" />
<RegionModule id="RemoteUserAliasServicesConnector" class="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAliases.RemoteUserAliasServicesConnector" />
<RegionModule id="AccessModule" class="OpenSim.Region.CoreModules.World.AccessModule" />
<RegionModule id="ArchiverModule" class="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />
<RegionModule id="EstateManagementModule" class="OpenSim.Region.CoreModules.World.Estate.EstateManagementModule" />
<RegionModule id="EstateModule" class="OpenSim.Region.CoreModules.World.Estate.EstateModule" />
<RegionModule id="DefaultDwellModule" class="OpenSim.Region.CoreModules.World.Land.DefaultDwellModule" />
<RegionModule id="LandManagementModule" class="OpenSim.Region.CoreModules.World.Land.LandManagementModule" />
<RegionModule id="PrimCountModule" class="OpenSim.Region.CoreModules.World.Land.PrimCountModule" />
<RegionModule id="MapImageModule" class="OpenSim.Region.CoreModules.World.LegacyMap.MapImageModule" />
<RegionModule id="EnvironmentModule" class="OpenSim.Region.CoreModules.World.LightShare.EnvironmentModule" />
<RegionModule id="MoapModule" class="OpenSim.Region.CoreModules.World.Media.Moap.MoapModule" />
<RegionModule id="BuySellModule" class="OpenSim.Region.CoreModules.World.Objects.BuySell.BuySellModule" />
<RegionModule id="ObjectCommandsModule" class="OpenSim.Region.CoreModules.World.Objects.Commands.ObjectCommandsModule" />
<RegionModule id="DefaultPermissionsModule" class="OpenSim.Region.CoreModules.World.Permissions.DefaultPermissionsModule" />
<RegionModule id="RegionCommandsModule" class="OpenSim.Region.CoreModules.World.Objects.Commands.RegionCommandsModule" />
<RegionModule id="RestartModule" class="OpenSim.Region.CoreModules.World.Region.RestartModule" />
<RegionModule id="SerialiserModule" class="penSim.Region.CoreModules.World.Serialiser.SerialiserModule" />
<RegionModule id="SoundModule" class="OpenSim.Region.CoreModules.World.Sound.SoundModule" />
<RegionModule id="TerrainModule" class="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" />
<RegionModule id="VegetationModule" class="OpenSim.Region.CoreModules.World.Vegetation.VegetationModule" />
<RegionModule id="Warp3DImageModule" class="OpenSim.Region.CoreModules.World.Warp3DMap.Warp3DImageModule" />
<RegionModule id="WindModule" class="OpenSim.Region.CoreModules.World.Wind.WindModule" />
<RegionModule id="ConfigurableWind" class="OpenSim.Region.CoreModules.World.Wind.Plugins.ConfigurableWind" />
<RegionModule id="SimpleRandomWind" class="OpenSim.Region.CoreModules.World.Wind.Plugins.SimpleRandomWind" />
<RegionModule id="HGWorldMapModule" class="OpenSim.Region.CoreModules.World.Land.HGWorldMapModule" />
<RegionModule id="MapSearchModule" class="OpenSim.Region.CoreModules.World.WorldMap.MapSearchModule" />
<RegionModule id="WorldMapModule" class="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" />
</Extension>
</Addin>

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
View file

@ -29,6 +29,7 @@ using log4net;
using System;
using System.Collections.Generic;
using System.Reflection;
using Mono.Addins;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Monitoring;
@ -40,6 +41,7 @@ using OpenMetaverse;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteXInventoryServicesConnector")]
public class RemoteXInventoryServicesConnector : ISharedRegionModule, IInventoryService
{
private static readonly ILog m_log =

1
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View file

@ -52,6 +52,7 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap;
using OSDArray = OpenMetaverse.StructuredData.OSDArray;
using Extension = Mono.Addins.ExtensionAttribute;
namespace OpenSim.Region.CoreModules.World.Land
{
// used for caching

2
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View file

@ -43,7 +43,7 @@ using PermissionMask = OpenSim.Framework.PermissionMask;
namespace OpenSim.Region.CoreModules.World.Permissions
{
// [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultPermissionsModule")]
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultPermissionsModule")]
public class DefaultPermissionsModule : INonSharedRegionModule, IPermissionsModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

2
OpenSim/Region/CoreModules/World/WorldMap/HGWorldMapModule.cs
View file

@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Hypergrid
namespace OpenSim.Region.CoreModules.World.Land
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGWorldMapModule")]
public class HGWorldMapModule : WorldMapModule

1
bin/config-include/GridHypergrid.ini
View file

@ -20,6 +20,7 @@
AuthorizationServices = "LocalAuthorizationServicesConnector"
PresenceServices = "RemotePresenceServicesConnector"
UserAccountServices = "RemoteUserAccountServicesConnector"
UserAliasServices = "RemoteUserAliasServicesConnector"
AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
GridUserServices = "RemoteGridUserServicesConnector"
SimulationServices = "RemoteSimulationConnectorModule"

1
tools/build-debug.sh
View file

@ -1 +1,2 @@
msbuild /t:Restore
msbuild /t:Build /p:AllowUnsafeBlocks=true /p:Configuration=Debug

1
tools/build-release.sh
View file

@ -1 +1,2 @@
msbuild /t:Restore
msbuild /t:Build /p:AllowUnsafeBlocks=true /p:Configuration=Release