aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-04-30 12:23:40 -0700
committerDiva Canto2011-04-30 12:23:40 -0700
commitc062138dad42ef7e52bbcb27c346ddecab94c5af (patch)
treeedff2328b4190e464edeaaebe77c7949b31c5ec1
parentRenamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll (diff)
downloadopensim-SC_OLD-c062138dad42ef7e52bbcb27c346ddecab94c5af.zip
opensim-SC_OLD-c062138dad42ef7e52bbcb27c346ddecab94c5af.tar.gz
opensim-SC_OLD-c062138dad42ef7e52bbcb27c346ddecab94c5af.tar.bz2
opensim-SC_OLD-c062138dad42ef7e52bbcb27c346ddecab94c5af.tar.xz
Moved several cap-based-service-providing modules from where they were into a newly created CoreModules/Caps. Not all.
-rw-r--r--OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs (renamed from OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Caps/GetMeshModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Caps/GetTextureModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Caps/ObjectCaps/ObjectAdd.cs (renamed from OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs)2
-rw-r--r--OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs)2
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs1
7 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs
index 1d8e70e..ab388b9 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;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using Caps=OpenSim.Framework.Capabilities.Caps; 39using Caps=OpenSim.Framework.Capabilities.Caps;
40 40
41namespace OpenSim.Region.CoreModules.Agent.Capabilities 41namespace OpenSim.Region.CoreModules.Capabilities
42{ 42{
43 public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule 43 public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule
44 { 44 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Caps/GetMeshModule.cs
index fc1ddef..46b2378 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;
44using OpenSim.Services.Interfaces; 44using OpenSim.Services.Interfaces;
45using Caps = OpenSim.Framework.Capabilities.Caps; 45using Caps = OpenSim.Framework.Capabilities.Caps;
46 46
47namespace OpenSim.Region.CoreModules.Avatar.Assets 47namespace OpenSim.Region.CoreModules.Capabilities
48{ 48{
49 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 49 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
50 public class GetMeshModule : INonSharedRegionModule 50 public class GetMeshModule : INonSharedRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Caps/GetTextureModule.cs
index df4d561..34095a2 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;
46using OpenSim.Services.Interfaces; 46using OpenSim.Services.Interfaces;
47using Caps = OpenSim.Framework.Capabilities.Caps; 47using Caps = OpenSim.Framework.Capabilities.Caps;
48 48
49namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps 49namespace OpenSim.Region.CoreModules.Capabilities
50{ 50{
51 #region Stream Handler 51 #region Stream Handler
52 52
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs
index 3d4c7b7..3ebaf1f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs
@@ -45,7 +45,7 @@ using OpenSim.Services.Interfaces;
45using Caps = OpenSim.Framework.Capabilities.Caps; 45using Caps = OpenSim.Framework.Capabilities.Caps;
46using OpenSim.Framework.Capabilities; 46using OpenSim.Framework.Capabilities;
47 47
48namespace OpenSim.Region.CoreModules.Avatar.Assets 48namespace OpenSim.Region.CoreModules.Capabilities
49{ 49{
50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
51 public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule 51 public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Caps/ObjectCaps/ObjectAdd.cs
index a0d72ed..5cd0fe7 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;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using Caps=OpenSim.Framework.Capabilities.Caps; 40using Caps=OpenSim.Framework.Capabilities.Caps;
41 41
42namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps 42namespace OpenSim.Region.CoreModules.Capabilities
43{ 43{
44 public class ObjectAdd : IRegionModule 44 public class ObjectAdd : IRegionModule
45 { 45 {
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 3114d7f..33bffeb 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;
49using OpenSim.Framework.Capabilities; 49using OpenSim.Framework.Capabilities;
50using ExtraParamType = OpenMetaverse.ExtraParamType; 50using ExtraParamType = OpenMetaverse.ExtraParamType;
51 51
52namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps 52namespace OpenSim.Region.CoreModules.Capabilities
53{ 53{
54 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 54 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
55 public class UploadObjectAssetModule : INonSharedRegionModule 55 public class UploadObjectAssetModule : INonSharedRegionModule
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 99517d2..d122409 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -39,7 +39,6 @@ using OpenSim.Region.Physics.Manager;
39using OpenSim.Region.Framework; 39using OpenSim.Region.Framework;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.CoreModules.Agent.Capabilities;
43using OpenSim.Region.CoreModules.Avatar.Gods; 42using OpenSim.Region.CoreModules.Avatar.Gods;
44using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; 43using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
45using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication; 44using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication;