aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorMike Mazur2008-07-23 03:08:31 +0000
committerMike Mazur2008-07-23 03:08:31 +0000
commita0930aa80d6f43d1dc1b4de0ee5708888cc45a5a (patch)
tree5fabd9a5104c256a874ebfc280b912e46364be50 /OpenSim/ApplicationPlugins
parentFirst version of position mapping between LSL <-> C# implemented. (diff)
downloadopensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.zip
opensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.tar.gz
opensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.tar.bz2
opensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.tar.xz
Thanks, sempuki, for a patch that moves control of Mono.Addins from source attributes to external XML files. Fix issues 1682 and 1786.
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs5
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs5
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs7
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs6
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs6
5 files changed, 0 insertions, 29 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 6743fb4..523f9fc 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -28,18 +28,13 @@
28using System.Reflection; 28using System.Reflection;
29using System.Threading; 29using System.Threading;
30using log4net; 30using log4net;
31using Mono.Addins;
32using Nini.Config; 31using Nini.Config;
33using OpenSim.Framework; 32using OpenSim.Framework;
34using OpenSim.Framework.RegionLoader.Filesystem; 33using OpenSim.Framework.RegionLoader.Filesystem;
35using OpenSim.Framework.RegionLoader.Web; 34using OpenSim.Framework.RegionLoader.Web;
36 35
37[assembly : Addin]
38[assembly : AddinDependency("OpenSim", "0.5")]
39
40namespace OpenSim.ApplicationPlugins.LoadRegions 36namespace OpenSim.ApplicationPlugins.LoadRegions
41{ 37{
42 [Extension("/OpenSim/Startup")]
43 public class LoadRegionsPlugin : IApplicationPlugin 38 public class LoadRegionsPlugin : IApplicationPlugin
44 { 39 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index d61e566..256e862 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -33,19 +33,14 @@ using System.Reflection;
33using System.Timers; 33using System.Timers;
34using libsecondlife; 34using libsecondlife;
35using log4net; 35using log4net;
36using Mono.Addins;
37using Nwc.XmlRpc; 36using Nwc.XmlRpc;
38using OpenSim.Framework; 37using OpenSim.Framework;
39using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
40using OpenSim.Region.Environment.Modules.World.Terrain; 39using OpenSim.Region.Environment.Modules.World.Terrain;
41using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
42 41
43[assembly : Addin]
44[assembly : AddinDependency("OpenSim", "0.5")]
45
46namespace OpenSim.ApplicationPlugins.RemoteController 42namespace OpenSim.ApplicationPlugins.RemoteController
47{ 43{
48 [Extension("/OpenSim/Startup")]
49 public class RemoteAdminPlugin : IApplicationPlugin 44 public class RemoteAdminPlugin : IApplicationPlugin
50 { 45 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index 9a1f628..50412c9 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -32,16 +32,9 @@ using System.Reflection;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.ApplicationPlugins.Rest; 34using OpenSim.ApplicationPlugins.Rest;
35using Mono.Addins;
36
37[assembly : Addin]
38[assembly : AddinDependency("OpenSim", "0.5")]
39 35
40namespace OpenSim.ApplicationPlugins.Rest.Inventory 36namespace OpenSim.ApplicationPlugins.Rest.Inventory
41{ 37{
42
43 [Extension("/OpenSim/Startup")]
44
45 public class RestHandler : RestPlugin, IHttpAgentHandler 38 public class RestHandler : RestPlugin, IHttpAgentHandler
46 { 39 {
47 40
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index 9d68225..5ec2526 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -37,7 +37,6 @@ using System.Timers;
37using System.Xml; 37using System.Xml;
38using System.Xml.Serialization; 38using System.Xml.Serialization;
39using libsecondlife; 39using libsecondlife;
40using Mono.Addins;
41using Nwc.XmlRpc; 40using Nwc.XmlRpc;
42using Nini.Config; 41using Nini.Config;
43using OpenSim.Framework; 42using OpenSim.Framework;
@@ -47,13 +46,8 @@ using OpenSim.Framework.Communications;
47using OpenSim.Region.Environment.Scenes; 46using OpenSim.Region.Environment.Scenes;
48using OpenSim.ApplicationPlugins.Rest; 47using OpenSim.ApplicationPlugins.Rest;
49 48
50[assembly : Addin]
51[assembly : AddinDependency("OpenSim", "0.5")]
52
53namespace OpenSim.ApplicationPlugins.Rest.Regions 49namespace OpenSim.ApplicationPlugins.Rest.Regions
54{ 50{
55
56 [Extension("/OpenSim/Startup")]
57 public partial class RestRegionPlugin : RestPlugin 51 public partial class RestRegionPlugin : RestPlugin
58 { 52 {
59 private static XmlSerializerNamespaces _xmlNs; 53 private static XmlSerializerNamespaces _xmlNs;
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 78e0e66..1f633d5 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -35,7 +35,6 @@ using System.Reflection;
35using System.Timers; 35using System.Timers;
36using System.Xml; 36using System.Xml;
37using libsecondlife; 37using libsecondlife;
38using Mono.Addins;
39using Nwc.XmlRpc; 38using Nwc.XmlRpc;
40using Nini.Config; 39using Nini.Config;
41using OpenSim.Framework; 40using OpenSim.Framework;
@@ -44,13 +43,8 @@ using OpenSim.Framework.Servers;
44using OpenSim.Framework.Communications; 43using OpenSim.Framework.Communications;
45using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Environment.Scenes;
46 45
47// [assembly : Addin]
48// [assembly : AddinDependency("OpenSim", "0.5")]
49
50namespace OpenSim.ApplicationPlugins.Rest 46namespace OpenSim.ApplicationPlugins.Rest
51{ 47{
52
53 // [Extension("/OpenSim/Startup")]
54 public abstract class RestPlugin : IApplicationPlugin 48 public abstract class RestPlugin : IApplicationPlugin
55 { 49 {
56 #region properties 50 #region properties