diff options
author | Arthur Valadares | 2009-06-18 14:33:35 +0000 |
---|---|---|
committer | Arthur Valadares | 2009-06-18 14:33:35 +0000 |
commit | f243dddc04a16a175e52e88fb34d38fb6fb643e5 (patch) | |
tree | f5049015ce013dd29847468763591f54d4c8b84c /OpenSim/Region/CoreModules | |
parent | Moved OpenSim/Framework/Communications/Capabilities up to OpenSim/Framework/C... (diff) | |
download | opensim-SC_OLD-f243dddc04a16a175e52e88fb34d38fb6fb643e5.zip opensim-SC_OLD-f243dddc04a16a175e52e88fb34d38fb6fb643e5.tar.gz opensim-SC_OLD-f243dddc04a16a175e52e88fb34d38fb6fb643e5.tar.bz2 opensim-SC_OLD-f243dddc04a16a175e52e88fb34d38fb6fb643e5.tar.xz |
* Corrected CAPS namespaces
* "luke, use the sed"
Diffstat (limited to 'OpenSim/Region/CoreModules')
7 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index f9f2797..ad2c7aa 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -34,7 +34,7 @@ using OpenMetaverse; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 37 | using Caps=OpenSim.Framework.Capabilities.Caps; |
38 | 38 | ||
39 | namespace OpenSim.Region.CoreModules.Agent.Capabilities | 39 | namespace OpenSim.Region.CoreModules.Agent.Capabilities |
40 | { | 40 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs index 5ea05c5..d8c7b84 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; | |||
37 | using OpenSim.Framework.Servers.HttpServer; | 37 | using OpenSim.Framework.Servers.HttpServer; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 40 | using Caps=OpenSim.Framework.Capabilities.Caps; |
41 | 41 | ||
42 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | 42 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps |
43 | { | 43 | { |
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index b9e081a..a94f23f 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; | |||
42 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; | 44 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; |
45 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 45 | using Caps=OpenSim.Framework.Capabilities.Caps; |
46 | 46 | ||
47 | namespace OpenSim.Region.CoreModules.Framework.EventQueue | 47 | namespace OpenSim.Region.CoreModules.Framework.EventQueue |
48 | { | 48 | { |
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
483 | if (AvatarID != UUID.Zero) | 483 | if (AvatarID != UUID.Zero) |
484 | { | 484 | { |
485 | // Repair the CAP! | 485 | // Repair the CAP! |
486 | //OpenSim.Framework.Communications.Capabilities.Caps caps = m_scene.GetCapsHandlerForUser(AvatarID); | 486 | //OpenSim.Framework.Capabilities.Caps caps = m_scene.GetCapsHandlerForUser(AvatarID); |
487 | //string capsBase = "/CAPS/EQG/"; | 487 | //string capsBase = "/CAPS/EQG/"; |
488 | //caps.RegisterHandler("EventQueueGet", | 488 | //caps.RegisterHandler("EventQueueGet", |
489 | //new RestHTTPHandler("POST", capsBase + capUUID.ToString() + "/", | 489 | //new RestHTTPHandler("POST", capsBase + capUUID.ToString() + "/", |
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs index 48895d4..08e1ecd 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Framework; | |||
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Communications.Services; | 39 | using OpenSim.Framework.Communications.Services; |
40 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
41 | using OpenSim.Framework.Communications.Capabilities; | 41 | using OpenSim.Framework.Capabilities; |
42 | using OpenSim.Framework.Servers.HttpServer; | 42 | using OpenSim.Framework.Servers.HttpServer; |
43 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index b8cc308..b357805 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -39,10 +39,10 @@ using Nini.Config; | |||
39 | using OpenMetaverse; | 39 | using OpenMetaverse; |
40 | using OpenMetaverse.StructuredData; | 40 | using OpenMetaverse.StructuredData; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Framework.Communications.Capabilities; | 42 | using OpenSim.Framework.Capabilities; |
43 | using OpenSim.Region.Framework.Interfaces; | 43 | using OpenSim.Region.Framework.Interfaces; |
44 | using OpenSim.Region.Framework.Scenes; | 44 | using OpenSim.Region.Framework.Scenes; |
45 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 45 | using Caps=OpenSim.Framework.Capabilities.Caps; |
46 | using OSDArray=OpenMetaverse.StructuredData.OSDArray; | 46 | using OSDArray=OpenMetaverse.StructuredData.OSDArray; |
47 | using OSDMap=OpenMetaverse.StructuredData.OSDMap; | 47 | using OSDMap=OpenMetaverse.StructuredData.OSDMap; |
48 | 48 | ||
@@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
353 | return responseMap; | 353 | return responseMap; |
354 | } | 354 | } |
355 | 355 | ||
356 | // Using OpenSim.Framework.Communications.Capabilities.Caps here one time.. | 356 | // Using OpenSim.Framework.Capabilities.Caps here one time.. |
357 | // so the long name is probably better then a using statement | 357 | // so the long name is probably better then a using statement |
358 | public void OnRegisterCaps(UUID agentID, Caps caps) | 358 | public void OnRegisterCaps(UUID agentID, Caps caps) |
359 | { | 359 | { |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 025d0fa..4c108f5 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -33,13 +33,13 @@ using log4net; | |||
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Capabilities; | 36 | using OpenSim.Framework.Capabilities; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Servers.HttpServer; | 38 | using OpenSim.Framework.Servers.HttpServer; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenSim.Region.Physics.Manager; | 41 | using OpenSim.Region.Physics.Manager; |
42 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 42 | using Caps=OpenSim.Framework.Capabilities.Caps; |
43 | 43 | ||
44 | namespace OpenSim.Region.CoreModules.World.Land | 44 | namespace OpenSim.Region.CoreModules.World.Land |
45 | { | 45 | { |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 1bcc244..6fe0b57 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -40,12 +40,12 @@ using OpenMetaverse; | |||
40 | using OpenMetaverse.Imaging; | 40 | using OpenMetaverse.Imaging; |
41 | using OpenMetaverse.StructuredData; | 41 | using OpenMetaverse.StructuredData; |
42 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
43 | using OpenSim.Framework.Communications.Capabilities; | 43 | using OpenSim.Framework.Capabilities; |
44 | using OpenSim.Framework.Servers; | 44 | using OpenSim.Framework.Servers; |
45 | using OpenSim.Framework.Servers.HttpServer; | 45 | using OpenSim.Framework.Servers.HttpServer; |
46 | using OpenSim.Region.Framework.Interfaces; | 46 | using OpenSim.Region.Framework.Interfaces; |
47 | using OpenSim.Region.Framework.Scenes; | 47 | using OpenSim.Region.Framework.Scenes; |
48 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 48 | using Caps=OpenSim.Framework.Capabilities.Caps; |
49 | using OSDArray=OpenMetaverse.StructuredData.OSDArray; | 49 | using OSDArray=OpenMetaverse.StructuredData.OSDArray; |
50 | using OSDMap=OpenMetaverse.StructuredData.OSDMap; | 50 | using OSDMap=OpenMetaverse.StructuredData.OSDMap; |
51 | 51 | ||