aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/CapabilitiesModule.cs (renamed from OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs)4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs (renamed from OpenSim/Region/CoreModules/Caps/GetMeshModule.cs)2
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs (renamed from OpenSim/Region/CoreModules/Caps/GetTextureModule.cs)4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs (renamed from OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs)2
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs (renamed from OpenSim/Region/CoreModules/Caps/ObjectCaps/ObjectAdd.cs)2
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs (renamed from OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs)2
-rw-r--r--prebuild.xml4
8 files changed, 15 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/CapabilitiesModule.cs
index ab388b9..b136555 100644
--- a/OpenSim/Region/CoreModules/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/CapabilitiesModule.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using Mono.Addins;
34using OpenMetaverse; 35using OpenMetaverse;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
@@ -38,8 +39,9 @@ using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
39using Caps=OpenSim.Framework.Capabilities.Caps; 40using Caps=OpenSim.Framework.Capabilities.Caps;
40 41
41namespace OpenSim.Region.CoreModules.Capabilities 42namespace OpenSim.Region.ClientStack.Linden
42{ 43{
44 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
43 public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule 45 public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule
44 { 46 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index fe97bf2..4827baa 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -33,6 +33,7 @@ using System.Reflection;
33using System.Threading; 33using System.Threading;
34using log4net; 34using log4net;
35using Nini.Config; 35using Nini.Config;
36using Mono.Addins;
36using OpenMetaverse; 37using OpenMetaverse;
37using OpenMetaverse.Messages.Linden; 38using OpenMetaverse.Messages.Linden;
38using OpenMetaverse.Packets; 39using OpenMetaverse.Packets;
@@ -53,6 +54,7 @@ namespace OpenSim.Region.ClientStack.Linden
53 public OSDMap body; 54 public OSDMap body;
54 } 55 }
55 56
57 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
56 public class EventQueueGetModule : IEventQueue, IRegionModule 58 public class EventQueueGetModule : IEventQueue, IRegionModule
57 { 59 {
58 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 60 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 46b2378..1d57143 100644
--- a/OpenSim/Region/CoreModules/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/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.Capabilities 47namespace OpenSim.Region.ClientStack.Linden
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/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 34095a2..58dbc14 100644
--- a/OpenSim/Region/CoreModules/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -35,6 +35,7 @@ using System.IO;
35using System.Web; 35using System.Web;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38using Mono.Addins;
38using OpenMetaverse; 39using OpenMetaverse;
39using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
40using OpenMetaverse.Imaging; 41using OpenMetaverse.Imaging;
@@ -46,7 +47,7 @@ using OpenSim.Region.Framework.Scenes;
46using OpenSim.Services.Interfaces; 47using OpenSim.Services.Interfaces;
47using Caps = OpenSim.Framework.Capabilities.Caps; 48using Caps = OpenSim.Framework.Capabilities.Caps;
48 49
49namespace OpenSim.Region.CoreModules.Capabilities 50namespace OpenSim.Region.ClientStack.Linden
50{ 51{
51 #region Stream Handler 52 #region Stream Handler
52 53
@@ -70,6 +71,7 @@ namespace OpenSim.Region.CoreModules.Capabilities
70 71
71 #endregion Stream Handler 72 #endregion Stream Handler
72 73
74 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
73 public class GetTextureModule : IRegionModule 75 public class GetTextureModule : IRegionModule
74 { 76 {
75 private static readonly ILog m_log = 77 private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
index 3ebaf1f..eddc288 100644
--- a/OpenSim/Region/CoreModules/Caps/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/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.Capabilities 48namespace OpenSim.Region.ClientStack.Linden
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/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
index 5cd0fe7..15139a3 100644
--- a/OpenSim/Region/CoreModules/Caps/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/ClientStack/Linden/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.Capabilities 42namespace OpenSim.Region.ClientStack.Linden
43{ 43{
44 public class ObjectAdd : IRegionModule 44 public class ObjectAdd : IRegionModule
45 { 45 {
diff --git a/OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 33bffeb..3809f84 100644
--- a/OpenSim/Region/CoreModules/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/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.Capabilities 52namespace OpenSim.Region.ClientStack.Linden
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/prebuild.xml b/prebuild.xml
index 90ee1eb..6a0b07a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1524,7 +1524,9 @@
1524 <ReferencePath>../../../../bin/</ReferencePath> 1524 <ReferencePath>../../../../bin/</ReferencePath>
1525 <Reference name="System"/> 1525 <Reference name="System"/>
1526 <Reference name="System.Core"/> 1526 <Reference name="System.Core"/>
1527 <Reference name="System.Drawing"/>
1527 <Reference name="System.Xml"/> 1528 <Reference name="System.Xml"/>
1529 <Reference name="System.Web"/>
1528 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 1530 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1529 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> 1531 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
1530 <Reference name="OpenMetaverse" path="../../../../bin/"/> 1532 <Reference name="OpenMetaverse" path="../../../../bin/"/>
@@ -1540,7 +1542,7 @@
1540 <Reference name="OpenSim.Region.ClientStack"/> 1542 <Reference name="OpenSim.Region.ClientStack"/>
1541 <Reference name="OpenSim.Region.Physics.Manager"/> 1543 <Reference name="OpenSim.Region.Physics.Manager"/>
1542 <Reference name="OpenSim.Services.Interfaces"/> 1544 <Reference name="OpenSim.Services.Interfaces"/>
1543 <Reference name="XMLRPC" path="../../../../bin/"/> 1545 <Reference name="Mono.Addins" path="../../../bin/"/>
1544 <Reference name="Nini" path="../../../../bin/"/> 1546 <Reference name="Nini" path="../../../../bin/"/>
1545 <Reference name="log4net" path="../../../../bin/"/> 1547 <Reference name="log4net" path="../../../../bin/"/>
1546 <Reference name="C5" path="../../../../bin/"/> 1548 <Reference name="C5" path="../../../../bin/"/>