From f243dddc04a16a175e52e88fb34d38fb6fb643e5 Mon Sep 17 00:00:00 2001 From: Arthur Valadares Date: Thu, 18 Jun 2009 14:33:35 +0000 Subject: [PATCH] * Corrected CAPS namespaces * "luke, use the sed" --- OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 +- OpenSim/Client/Linden/LLStandaloneLoginService.cs | 2 +- OpenSim/Framework/Capabilities/Caps.cs | 2 +- OpenSim/Framework/Capabilities/CapsHandlers.cs | 2 +- OpenSim/Framework/Capabilities/CapsUtil.cs | 2 +- OpenSim/Framework/Capabilities/LLSD.cs | 2 +- OpenSim/Framework/Capabilities/LLSDArray.cs | 2 +- OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs | 2 +- OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs | 2 +- OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs | 2 +- OpenSim/Framework/Capabilities/LLSDCapEvent.cs | 2 +- OpenSim/Framework/Capabilities/LLSDEmpty.cs | 2 +- OpenSim/Framework/Capabilities/LLSDHelpers.cs | 2 +- OpenSim/Framework/Capabilities/LLSDInventoryItem.cs | 2 +- OpenSim/Framework/Capabilities/LLSDItemUpdate.cs | 2 +- OpenSim/Framework/Capabilities/LLSDMapLayer.cs | 2 +- OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs | 2 +- OpenSim/Framework/Capabilities/LLSDMapRequest.cs | 2 +- OpenSim/Framework/Capabilities/LLSDMethod.cs | 2 +- OpenSim/Framework/Capabilities/LLSDMethodString.cs | 2 +- .../Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs | 2 +- OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs | 2 +- OpenSim/Framework/Capabilities/LLSDStreamHandler.cs | 2 +- .../Capabilities/LLSDTaskInventoryUploadComplete.cs | 2 +- OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs | 2 +- OpenSim/Framework/Capabilities/LLSDTest.cs | 2 +- OpenSim/Framework/Capabilities/LLSDType.cs | 2 +- OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs | 2 +- .../Framework/Communications/Services/HGInventoryService.cs | 4 ++-- .../Framework/Communications/Services/HGLoginAuthService.cs | 2 +- OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs | 2 +- OpenSim/Grid/UserServer.Modules/UserLoginService.cs | 2 +- .../CoreModules/Agent/Capabilities/CapabilitiesModule.cs | 2 +- OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | 2 +- .../CoreModules/Framework/EventQueue/EventQueueGetModule.cs | 4 ++-- .../Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs | 2 +- .../Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 6 +++--- .../Region/CoreModules/World/Land/LandManagementModule.cs | 4 ++-- OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 ++-- OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 4 ++-- OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | 2 +- OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs | 2 +- OpenSim/Region/Framework/Scenes/EventManager.cs | 2 +- .../Scenes/Hypergrid/HGSceneCommunicationService.cs | 2 +- .../Region/Framework/Scenes/SceneCommunicationService.cs | 2 +- .../Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 4 ++-- .../Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | 2 +- .../Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | 2 +- OpenSim/Region/UserStatistics/WebStatsModule.cs | 2 +- 49 files changed, 57 insertions(+), 57 deletions(-) diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index cc5f5ff498..02a3b3728a 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs @@ -37,7 +37,7 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Interfaces; diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs index c2de3487b4..6d8586d763 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs @@ -38,7 +38,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Interfaces; diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index bd38b50bef..12bf04dd66 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs @@ -38,7 +38,7 @@ using OpenSim.Services.Interfaces; // using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { public delegate void UpLoadedAsset( string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, diff --git a/OpenSim/Framework/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Capabilities/CapsHandlers.cs index d977639735..5d42bfc9b4 100644 --- a/OpenSim/Framework/Capabilities/CapsHandlers.cs +++ b/OpenSim/Framework/Capabilities/CapsHandlers.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { /// /// CapsHandlers is a cap handler container but also takes diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs index fb8a58e2df..cd8c00114c 100644 --- a/OpenSim/Framework/Capabilities/CapsUtil.cs +++ b/OpenSim/Framework/Capabilities/CapsUtil.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { /// /// Capabilities utility methods diff --git a/OpenSim/Framework/Capabilities/LLSD.cs b/OpenSim/Framework/Capabilities/LLSD.cs index 73556fcb78..c8bc2738fb 100644 --- a/OpenSim/Framework/Capabilities/LLSD.cs +++ b/OpenSim/Framework/Capabilities/LLSD.cs @@ -34,7 +34,7 @@ using System.Text; using System.Xml; using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { /// /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code. diff --git a/OpenSim/Framework/Capabilities/LLSDArray.cs b/OpenSim/Framework/Capabilities/LLSDArray.cs index b24e0295eb..d7a98b7729 100644 --- a/OpenSim/Framework/Capabilities/LLSDArray.cs +++ b/OpenSim/Framework/Capabilities/LLSDArray.cs @@ -27,7 +27,7 @@ using System.Collections; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("ARRAY")] public class OSDArray diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs index dd54fa9745..65c1369e17 100644 --- a/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs +++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs @@ -28,7 +28,7 @@ using System; using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class LLSDAssetUploadComplete diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs index 883f51297a..96a43a77f1 100644 --- a/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs @@ -28,7 +28,7 @@ using System; using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDAssetUploadRequest diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs index e4cd9d2524..492f4198f1 100644 --- a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDAssetUploadResponse diff --git a/OpenSim/Framework/Capabilities/LLSDCapEvent.cs b/OpenSim/Framework/Capabilities/LLSDCapEvent.cs index c91e57047c..71b2ed37e3 100644 --- a/OpenSim/Framework/Capabilities/LLSDCapEvent.cs +++ b/OpenSim/Framework/Capabilities/LLSDCapEvent.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class LLSDCapEvent diff --git a/OpenSim/Framework/Capabilities/LLSDEmpty.cs b/OpenSim/Framework/Capabilities/LLSDEmpty.cs index 1c7c25d401..0dce725248 100644 --- a/OpenSim/Framework/Capabilities/LLSDEmpty.cs +++ b/OpenSim/Framework/Capabilities/LLSDEmpty.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class LLSDEmpty diff --git a/OpenSim/Framework/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Capabilities/LLSDHelpers.cs index 596dfc3b2c..1bda92c20e 100644 --- a/OpenSim/Framework/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Framework/Capabilities/LLSDHelpers.cs @@ -31,7 +31,7 @@ using System.IO; using System.Reflection; using System.Xml; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { public class LLSDHelpers { diff --git a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs index 5fa6d671d3..8d3e322bcc 100644 --- a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDInventoryItem diff --git a/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs index 1e2600e03e..a3a4d3ad41 100644 --- a/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs +++ b/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDItemUpdate diff --git a/OpenSim/Framework/Capabilities/LLSDMapLayer.cs b/OpenSim/Framework/Capabilities/LLSDMapLayer.cs index 1c1de3cea3..75dc2fd0cc 100644 --- a/OpenSim/Framework/Capabilities/LLSDMapLayer.cs +++ b/OpenSim/Framework/Capabilities/LLSDMapLayer.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class OSDMapLayer diff --git a/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs index a2bf9d435d..f9b47f5a4f 100644 --- a/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs +++ b/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class LLSDMapLayerResponse diff --git a/OpenSim/Framework/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Capabilities/LLSDMapRequest.cs index 3442474002..334920df18 100644 --- a/OpenSim/Framework/Capabilities/LLSDMapRequest.cs +++ b/OpenSim/Framework/Capabilities/LLSDMapRequest.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class LLSDMapRequest diff --git a/OpenSim/Framework/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Capabilities/LLSDMethod.cs index d832aa3181..67f2680fa4 100644 --- a/OpenSim/Framework/Capabilities/LLSDMethod.cs +++ b/OpenSim/Framework/Capabilities/LLSDMethod.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { public delegate TResponse LLSDMethod(TRequest request); } \ No newline at end of file diff --git a/OpenSim/Framework/Capabilities/LLSDMethodString.cs b/OpenSim/Framework/Capabilities/LLSDMethodString.cs index d03bdb1d08..8e23cf53fb 100644 --- a/OpenSim/Framework/Capabilities/LLSDMethodString.cs +++ b/OpenSim/Framework/Capabilities/LLSDMethodString.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { public delegate TResponse LLSDMethodString(TRequest request, string path); } diff --git a/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs index 855836fa80..dec85df6eb 100644 --- a/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs +++ b/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs @@ -28,7 +28,7 @@ using System.Collections; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDParcelVoiceInfoResponse diff --git a/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs index 6a95acd498..c99df78df6 100644 --- a/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs +++ b/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs @@ -28,7 +28,7 @@ using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class LLSDRemoteParcelResponse diff --git a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs index 18f0a2a51b..0ced4d7f5c 100644 --- a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs @@ -31,7 +31,7 @@ using System.Text; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { public class LLSDStreamhandler : BaseStreamHandler where TRequest : new() diff --git a/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs index ef8bd20f79..370a8a10aa 100644 --- a/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs +++ b/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDTaskInventoryUploadComplete diff --git a/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs index 613618826c..e495e9cdf2 100644 --- a/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs +++ b/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs @@ -27,7 +27,7 @@ using OpenMetaverse; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDTaskScriptUpdate diff --git a/OpenSim/Framework/Capabilities/LLSDTest.cs b/OpenSim/Framework/Capabilities/LLSDTest.cs index bbe46a0c28..ba907961c9 100644 --- a/OpenSim/Framework/Capabilities/LLSDTest.cs +++ b/OpenSim/Framework/Capabilities/LLSDTest.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [LLSDType("MAP")] public class LLSDTest diff --git a/OpenSim/Framework/Capabilities/LLSDType.cs b/OpenSim/Framework/Capabilities/LLSDType.cs index 06896e1ce0..c2f1f01eba 100644 --- a/OpenSim/Framework/Capabilities/LLSDType.cs +++ b/OpenSim/Framework/Capabilities/LLSDType.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [AttributeUsage(AttributeTargets.Class)] public class LLSDType : Attribute diff --git a/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs index ff98a7399b..93fa596898 100644 --- a/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs +++ b/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs @@ -26,7 +26,7 @@ * */ -namespace OpenSim.Framework.Communications.Capabilities +namespace OpenSim.Framework.Capabilities { [OSDMap] public class LLSDVoiceAccountResponse diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs index af55236f11..e253474596 100644 --- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs +++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs @@ -36,8 +36,8 @@ using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.Communications.Clients; using OpenSim.Framework.Communications.Cache; -using Caps = OpenSim.Framework.Communications.Capabilities.Caps; -using LLSDHelpers = OpenSim.Framework.Communications.Capabilities.LLSDHelpers; +using Caps = OpenSim.Framework.Capabilities.Caps; +using LLSDHelpers = OpenSim.Framework.Capabilities.LLSDHelpers; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Services.Interfaces; diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs index f496082736..3ab9b38bd8 100644 --- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs +++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs @@ -33,7 +33,7 @@ using System.Reflection; using System.Text.RegularExpressions; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenMetaverse; diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs index c4c82e5897..9d31d813ba 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs @@ -38,7 +38,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index dff60596ae..01d5537056 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs @@ -39,7 +39,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index f9f2797098..ad2c7aa0f4 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs @@ -34,7 +34,7 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.CoreModules.Agent.Capabilities { diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs index 5ea05c5f87..d8c7b84622 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs @@ -37,7 +37,7 @@ using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps { diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index b9e081a5cc..a94f23f0ba 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs @@ -42,7 +42,7 @@ using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.CoreModules.Framework.EventQueue { @@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue if (AvatarID != UUID.Zero) { // Repair the CAP! - //OpenSim.Framework.Communications.Capabilities.Caps caps = m_scene.GetCapsHandlerForUser(AvatarID); + //OpenSim.Framework.Capabilities.Caps caps = m_scene.GetCapsHandlerForUser(AvatarID); //string capsBase = "/CAPS/EQG/"; //caps.RegisterHandler("EventQueueGet", //new RestHTTPHandler("POST", capsBase + capUUID.ToString() + "/", diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs index 48895d441d..08e1ecdb6f 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs @@ -38,7 +38,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Interfaces; diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index b8cc308e22..b357805b40 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs @@ -39,10 +39,10 @@ using Nini.Config; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; using OSDArray=OpenMetaverse.StructuredData.OSDArray; using OSDMap=OpenMetaverse.StructuredData.OSDMap; @@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.InterGrid return responseMap; } - // Using OpenSim.Framework.Communications.Capabilities.Caps here one time.. + // Using OpenSim.Framework.Capabilities.Caps here one time.. // so the long name is probably better then a using statement public void OnRegisterCaps(UUID agentID, Caps caps) { diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 025d0fab1c..4c108f5e84 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -33,13 +33,13 @@ using log4net; using Nini.Config; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.CoreModules.World.Land { diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 1bcc2445f8..6fe0b57c71 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -40,12 +40,12 @@ using OpenMetaverse; using OpenMetaverse.Imaging; using OpenMetaverse.StructuredData; using OpenSim.Framework; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; using OSDArray=OpenMetaverse.StructuredData.OSDArray; using OSDMap=OpenMetaverse.StructuredData.OSDMap; diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 46545c1bc9..ed5c9ece54 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs @@ -31,11 +31,11 @@ using System.Reflection; using System.Xml; using log4net; using OpenMetaverse; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Scenes; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.DataSnapshot { diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs index 1690b3d766..54a87f939e 100644 --- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs +++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; namespace OpenSim.Region.DataSnapshot { diff --git a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs index 2fe9c81b9a..73bffa02f1 100644 --- a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.Framework.Interfaces { diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 9a42634b33..cb1543421c 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs @@ -31,7 +31,7 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Region.Framework.Interfaces; -using Caps=OpenSim.Framework.Communications.Capabilities.Caps; +using Caps=OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.Framework.Scenes { diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index d16c3c6395..5c99d7342c 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs @@ -36,7 +36,7 @@ using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Region.Framework.Scenes.Hypergrid diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 833f8047e2..665354497c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -37,7 +37,7 @@ using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Region.Framework.Interfaces; using OpenSim.Services.Interfaces; using OSD = OpenMetaverse.StructuredData.OSD; diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index de78f5f16a..ce685226b0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs @@ -42,12 +42,12 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Communications.Capabilities; +using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Caps = OpenSim.Framework.Communications.Capabilities.Caps; +using Caps = OpenSim.Framework.Capabilities.Caps; using System.Text.RegularExpressions; diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs index 31295f8a70..9625342c3d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs @@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Caps = OpenSim.Framework.Communications.Capabilities.Caps; +using Caps = OpenSim.Framework.Capabilities.Caps; namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups { diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs index bc421c27ea..da45177107 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs @@ -42,7 +42,7 @@ using OpenSim.Region.CoreModules.Framework.EventQueue; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Caps = OpenSim.Framework.Communications.Capabilities.Caps; +using Caps = OpenSim.Framework.Capabilities.Caps; using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags; diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index e383e71e22..756a5d0643 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs @@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Scenes; using Mono.Data.SqliteClient; -using Caps = OpenSim.Framework.Communications.Capabilities.Caps; +using Caps = OpenSim.Framework.Capabilities.Caps; using OSD = OpenMetaverse.StructuredData.OSD; using OSDMap = OpenMetaverse.StructuredData.OSDMap;