From f243dddc04a16a175e52e88fb34d38fb6fb643e5 Mon Sep 17 00:00:00 2001 From: Arthur Valadares Date: Thu, 18 Jun 2009 14:33:35 +0000 Subject: * Corrected CAPS namespaces * "luke, use the sed" --- 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 +- OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs | 2 +- OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs | 2 +- OpenSim/Framework/Capabilities/LLSDStreamHandler.cs | 2 +- OpenSim/Framework/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 +- OpenSim/Framework/Communications/Services/HGInventoryService.cs | 4 ++-- OpenSim/Framework/Communications/Services/HGLoginAuthService.cs | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index bd38b50..12bf04d 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 d977639..5d42bfc 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 fb8a58e..cd8c001 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 73556fc..c8bc273 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 b24e029..d7a98b7 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 dd54fa9..65c1369 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 883f512..96a43a7 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 e4cd9d2..492f419 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 c91e570..71b2ed3 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 1c7c25d..0dce725 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 596dfc3..1bda92c 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 5fa6d67..8d3e322 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 1e2600e..a3a4d3a 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 1c1de3c..75dc2fd 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 a2bf9d4..f9b47f5 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 3442474..334920d 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 d832aa3..67f2680 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 d03bdb1..8e23cf5 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 855836f..dec85df 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 6a95acd..c99df78 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 18f0a2a..0ced4d7 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 ef8bd20..370a8a1 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 6136188..e495e9c 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 bbe46a0..ba90796 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 06896e1..c2f1f01 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 ff98a73..93fa596 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 af55236..e253474 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 f496082..3ab9b38 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; -- cgit v1.1