OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Corrected CAPS namespaces 

* "luke, use the sed"
0.6.6-post-fixes
Arthur Valadares 2009-06-18 14:33:35 +00:00
parent 913bc3bdb3
commit f243dddc04
49 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Client/Linden/LLStandaloneLoginModule.cs
View File

@ -37,7 +37,7 @@ using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;

2
OpenSim/Client/Linden/LLStandaloneLoginService.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Services;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;

2
OpenSim/Framework/Capabilities/Caps.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Services.Interfaces;
// using OpenSim.Region.Framework.Interfaces; // using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
public delegate void UpLoadedAsset( public delegate void UpLoadedAsset(
string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder, string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder,

2
OpenSim/Framework/Capabilities/CapsHandlers.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
/// <summary> /// <summary>
/// CapsHandlers is a cap handler container but also takes /// CapsHandlers is a cap handler container but also takes

2
OpenSim/Framework/Capabilities/CapsUtil.cs
View File

@ -27,7 +27,7 @@
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
/// <summary> /// <summary>
/// Capabilities utility methods /// Capabilities utility methods

2
OpenSim/Framework/Capabilities/LLSD.cs
View File

@ -34,7 +34,7 @@ using System.Text;
using System.Xml; using System.Xml;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
/// <summary> /// <summary>
/// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code. /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code.

2
OpenSim/Framework/Capabilities/LLSDArray.cs
View File

@ -27,7 +27,7 @@
using System.Collections; using System.Collections;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("ARRAY")] [LLSDType("ARRAY")]
public class OSDArray public class OSDArray

2
OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDAssetUploadComplete public class LLSDAssetUploadComplete

2
OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDAssetUploadRequest public class LLSDAssetUploadRequest

2
OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDAssetUploadResponse public class LLSDAssetUploadResponse

2
OpenSim/Framework/Capabilities/LLSDCapEvent.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDCapEvent public class LLSDCapEvent

2
OpenSim/Framework/Capabilities/LLSDEmpty.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDEmpty public class LLSDEmpty

2
OpenSim/Framework/Capabilities/LLSDHelpers.cs
View File

@ -31,7 +31,7 @@ using System.IO;
using System.Reflection; using System.Reflection;
using System.Xml; using System.Xml;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
public class LLSDHelpers public class LLSDHelpers
{ {

2
OpenSim/Framework/Capabilities/LLSDInventoryItem.cs
View File

@ -27,7 +27,7 @@
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDInventoryItem public class LLSDInventoryItem

2
OpenSim/Framework/Capabilities/LLSDItemUpdate.cs
View File

@ -27,7 +27,7 @@
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDItemUpdate public class LLSDItemUpdate

2
OpenSim/Framework/Capabilities/LLSDMapLayer.cs
View File

@ -27,7 +27,7 @@
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class OSDMapLayer public class OSDMapLayer

2
OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDMapLayerResponse public class LLSDMapLayerResponse

2
OpenSim/Framework/Capabilities/LLSDMapRequest.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDMapRequest public class LLSDMapRequest

2
OpenSim/Framework/Capabilities/LLSDMethod.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request); public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
} }

2
OpenSim/Framework/Capabilities/LLSDMethodString.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
public delegate TResponse LLSDMethodString<TRequest, TResponse>(TRequest request, string path); public delegate TResponse LLSDMethodString<TRequest, TResponse>(TRequest request, string path);
} }

2
OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs
View File

@ -28,7 +28,7 @@
using System.Collections; using System.Collections;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDParcelVoiceInfoResponse public class LLSDParcelVoiceInfoResponse

2
OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs
View File

@ -28,7 +28,7 @@
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDRemoteParcelResponse public class LLSDRemoteParcelResponse

2
OpenSim/Framework/Capabilities/LLSDStreamHandler.cs
View File

@ -31,7 +31,7 @@ using System.Text;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
where TRequest : new() where TRequest : new()

2
OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs
View File

@ -27,7 +27,7 @@
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDTaskInventoryUploadComplete public class LLSDTaskInventoryUploadComplete

2
OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs
View File

@ -27,7 +27,7 @@
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDTaskScriptUpdate public class LLSDTaskScriptUpdate

2
OpenSim/Framework/Capabilities/LLSDTest.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[LLSDType("MAP")] [LLSDType("MAP")]
public class LLSDTest public class LLSDTest

2
OpenSim/Framework/Capabilities/LLSDType.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[AttributeUsage(AttributeTargets.Class)] [AttributeUsage(AttributeTargets.Class)]
public class LLSDType : Attribute public class LLSDType : Attribute

2
OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs
View File

@ -26,7 +26,7 @@
* *
*/ */
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Capabilities
{ {
[OSDMap] [OSDMap]
public class LLSDVoiceAccountResponse public class LLSDVoiceAccountResponse

4
OpenSim/Framework/Communications/Services/HGInventoryService.cs
View File

@ -36,8 +36,8 @@ using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Clients; using OpenSim.Framework.Communications.Clients;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Capabilities.Caps;
using LLSDHelpers = OpenSim.Framework.Communications.Capabilities.LLSDHelpers; using LLSDHelpers = OpenSim.Framework.Capabilities.LLSDHelpers;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;

2
OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
View File

@ -33,7 +33,7 @@ using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenMetaverse; using OpenMetaverse;

2
OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Services;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;

2
OpenSim/Grid/UserServer.Modules/UserLoginService.cs
View File

@ -39,7 +39,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Services;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;

2
OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
View File

@ -34,7 +34,7 @@ using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.CoreModules.Agent.Capabilities namespace OpenSim.Region.CoreModules.Agent.Capabilities
{ {

2
OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
View File

@ -37,7 +37,7 @@ using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
{ {

4
OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
View File

@ -42,7 +42,7 @@ using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.CoreModules.Framework.EventQueue namespace OpenSim.Region.CoreModules.Framework.EventQueue
{ {
@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
if (AvatarID != UUID.Zero) if (AvatarID != UUID.Zero)
{ {
// Repair the CAP! // 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/"; //string capsBase = "/CAPS/EQG/";
//caps.RegisterHandler("EventQueueGet", //caps.RegisterHandler("EventQueueGet",
//new RestHTTPHandler("POST", capsBase + capUUID.ToString() + "/", //new RestHTTPHandler("POST", capsBase + capUUID.ToString() + "/",

2
OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Services; using OpenSim.Framework.Communications.Services;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;

6
OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
View File

@ -39,10 +39,10 @@ using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
using OSDArray=OpenMetaverse.StructuredData.OSDArray; using OSDArray=OpenMetaverse.StructuredData.OSDArray;
using OSDMap=OpenMetaverse.StructuredData.OSDMap; using OSDMap=OpenMetaverse.StructuredData.OSDMap;
@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
return responseMap; 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 // so the long name is probably better then a using statement
public void OnRegisterCaps(UUID agentID, Caps caps) public void OnRegisterCaps(UUID agentID, Caps caps)
{ {

4
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -33,13 +33,13 @@ using log4net;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.CoreModules.World.Land namespace OpenSim.Region.CoreModules.World.Land
{ {

4
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -40,12 +40,12 @@ using OpenMetaverse;
using OpenMetaverse.Imaging; using OpenMetaverse.Imaging;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
using OSDArray=OpenMetaverse.StructuredData.OSDArray; using OSDArray=OpenMetaverse.StructuredData.OSDArray;
using OSDMap=OpenMetaverse.StructuredData.OSDMap; using OSDMap=OpenMetaverse.StructuredData.OSDMap;

4
OpenSim/Region/DataSnapshot/DataRequestHandler.cs
View File

@ -31,11 +31,11 @@ using System.Reflection;
using System.Xml; using System.Xml;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {

2
OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
View File

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {

2
OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
View File

@ -28,7 +28,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.Framework.Interfaces namespace OpenSim.Region.Framework.Interfaces
{ {

2
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@ -31,7 +31,7 @@ using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.Framework.Scenes namespace OpenSim.Region.Framework.Scenes
{ {

2
OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Framework.Scenes.Hypergrid namespace OpenSim.Region.Framework.Scenes.Hypergrid

2
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -37,7 +37,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OSD = OpenMetaverse.StructuredData.OSD; using OSD = OpenMetaverse.StructuredData.OSD;

4
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -42,12 +42,12 @@ using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Capabilities.Caps;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
View File

@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{ {

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
View File

@ -42,7 +42,7 @@ using OpenSim.Region.CoreModules.Framework.EventQueue;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Capabilities.Caps;
using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags; using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;

2
OpenSim/Region/UserStatistics/WebStatsModule.cs
View File

@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Scenes;
using Mono.Data.SqliteClient; using Mono.Data.SqliteClient;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Capabilities.Caps;
using OSD = OpenMetaverse.StructuredData.OSD; using OSD = OpenMetaverse.StructuredData.OSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap; using OSDMap = OpenMetaverse.StructuredData.OSDMap;