From c062138dad42ef7e52bbcb27c346ddecab94c5af Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 30 Apr 2011 12:23:40 -0700 Subject: [PATCH] Moved several cap-based-service-providing modules from where they were into a newly created CoreModules/Caps. Not all. --- .../{Agent/Capabilities => Caps}/CapabilitiesModule.cs | 2 +- .../Region/CoreModules/{Avatar/Assets => Caps}/GetMeshModule.cs | 2 +- .../CoreModules/{Avatar/Assets => Caps}/GetTextureModule.cs | 2 +- .../Assets => Caps}/NewFileAgentInventoryVariablePriceModule.cs | 2 +- .../Region/CoreModules/{Avatar => Caps}/ObjectCaps/ObjectAdd.cs | 2 +- .../{Avatar => Caps}/ObjectCaps/UploadObjectAssetModule.cs | 2 +- OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) rename OpenSim/Region/CoreModules/{Agent/Capabilities => Caps}/CapabilitiesModule.cs (99%) rename OpenSim/Region/CoreModules/{Avatar/Assets => Caps}/GetMeshModule.cs (99%) rename OpenSim/Region/CoreModules/{Avatar/Assets => Caps}/GetTextureModule.cs (99%) rename OpenSim/Region/CoreModules/{Avatar/Assets => Caps}/NewFileAgentInventoryVariablePriceModule.cs (99%) rename OpenSim/Region/CoreModules/{Avatar => Caps}/ObjectCaps/ObjectAdd.cs (99%) rename OpenSim/Region/CoreModules/{Avatar => Caps}/ObjectCaps/UploadObjectAssetModule.cs (99%) diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs similarity index 99% rename from OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs rename to OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs index 1d8e70ed54..ab388b9cc6 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs @@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using Caps=OpenSim.Framework.Capabilities.Caps; -namespace OpenSim.Region.CoreModules.Agent.Capabilities +namespace OpenSim.Region.CoreModules.Capabilities { public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule { diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Caps/GetMeshModule.cs similarity index 99% rename from OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs rename to OpenSim/Region/CoreModules/Caps/GetMeshModule.cs index fc1ddef38c..46b2378c64 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Caps/GetMeshModule.cs @@ -44,7 +44,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; using Caps = OpenSim.Framework.Capabilities.Caps; -namespace OpenSim.Region.CoreModules.Avatar.Assets +namespace OpenSim.Region.CoreModules.Capabilities { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] public class GetMeshModule : INonSharedRegionModule diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Caps/GetTextureModule.cs similarity index 99% rename from OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs rename to OpenSim/Region/CoreModules/Caps/GetTextureModule.cs index df4d561024..34095a244c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Region/CoreModules/Caps/GetTextureModule.cs @@ -46,7 +46,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; using Caps = OpenSim.Framework.Capabilities.Caps; -namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps +namespace OpenSim.Region.CoreModules.Capabilities { #region Stream Handler diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs similarity index 99% rename from OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs rename to OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs index 3d4c7b7527..3ebaf1fcb7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs @@ -45,7 +45,7 @@ using OpenSim.Services.Interfaces; using Caps = OpenSim.Framework.Capabilities.Caps; using OpenSim.Framework.Capabilities; -namespace OpenSim.Region.CoreModules.Avatar.Assets +namespace OpenSim.Region.CoreModules.Capabilities { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Caps/ObjectCaps/ObjectAdd.cs similarity index 99% rename from OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs rename to OpenSim/Region/CoreModules/Caps/ObjectCaps/ObjectAdd.cs index a0d72ede22..5cd0fe732d 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/CoreModules/Caps/ObjectCaps/ObjectAdd.cs @@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using Caps=OpenSim.Framework.Capabilities.Caps; -namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps +namespace OpenSim.Region.CoreModules.Capabilities { public class ObjectAdd : IRegionModule { diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs similarity index 99% rename from OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs rename to OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs index 3114d7ff59..33bffeb0d3 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs @@ -49,7 +49,7 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap; using OpenSim.Framework.Capabilities; using ExtraParamType = OpenMetaverse.ExtraParamType; -namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps +namespace OpenSim.Region.CoreModules.Capabilities { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] public class UploadObjectAssetModule : INonSharedRegionModule diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 99517d2b19..d1224099e2 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs @@ -39,7 +39,6 @@ using OpenSim.Region.Physics.Manager; using OpenSim.Region.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using OpenSim.Region.CoreModules.Agent.Capabilities; using OpenSim.Region.CoreModules.Avatar.Gods; using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication;