From cda526939145d92794eb14554ef43badaf06c149 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Fri, 11 Jul 2008 02:04:02 +0000 Subject: Mantis#1682. Revert temporarily, Sempuki's mono addins patch while he studies the issues in Windows a little bit. --- OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 5 +++++ OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 5 +++++ OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 7 +++++++ OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | 1 + OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs | 1 + OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | 6 ++++++ OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 6 ++++++ 7 files changed, 31 insertions(+) (limited to 'OpenSim/ApplicationPlugins') diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 523f9fc..6743fb4 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs @@ -28,13 +28,18 @@ using System.Reflection; using System.Threading; using log4net; +using Mono.Addins; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.RegionLoader.Filesystem; using OpenSim.Framework.RegionLoader.Web; +[assembly : Addin] +[assembly : AddinDependency("OpenSim", "0.5")] + namespace OpenSim.ApplicationPlugins.LoadRegions { + [Extension("/OpenSim/Startup")] public class LoadRegionsPlugin : IApplicationPlugin { 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 767b736..0a58a0a 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -33,14 +33,19 @@ using System.Reflection; using System.Timers; using libsecondlife; using log4net; +using Mono.Addins; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Servers; using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Scenes; +[assembly : Addin] +[assembly : AddinDependency("OpenSim", "0.5")] + namespace OpenSim.ApplicationPlugins.RemoteController { + [Extension("/OpenSim/Startup")] public class RemoteAdminPlugin : IApplicationPlugin { 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 1ec3567..c351272 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs @@ -32,9 +32,16 @@ using System.Reflection; using OpenSim.Framework; using OpenSim.Framework.Servers; using OpenSim.ApplicationPlugins.Rest; +using Mono.Addins; + +[assembly : Addin] +[assembly : AddinDependency("OpenSim", "0.5")] namespace OpenSim.ApplicationPlugins.Rest.Inventory { + + [Extension("/OpenSim/Startup")] + public class RestHandler : RestPlugin, IHttpAgentHandler { diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs index 2734c77..a605d09 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs @@ -37,6 +37,7 @@ using System.Timers; using System.Xml; using System.Xml.Serialization; using libsecondlife; +using Mono.Addins; using Nwc.XmlRpc; using Nini.Config; using OpenSim.Framework; diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs index a40af29..e6131f1 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs @@ -37,6 +37,7 @@ using System.Timers; using System.Xml; using System.Xml.Serialization; using libsecondlife; +using Mono.Addins; using Nwc.XmlRpc; using Nini.Config; using OpenSim.Framework; diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index 5ec2526..9d68225 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs @@ -37,6 +37,7 @@ using System.Timers; using System.Xml; using System.Xml.Serialization; using libsecondlife; +using Mono.Addins; using Nwc.XmlRpc; using Nini.Config; using OpenSim.Framework; @@ -46,8 +47,13 @@ using OpenSim.Framework.Communications; using OpenSim.Region.Environment.Scenes; using OpenSim.ApplicationPlugins.Rest; +[assembly : Addin] +[assembly : AddinDependency("OpenSim", "0.5")] + namespace OpenSim.ApplicationPlugins.Rest.Regions { + + [Extension("/OpenSim/Startup")] public partial class RestRegionPlugin : RestPlugin { private static XmlSerializerNamespaces _xmlNs; diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index 1f633d5..78e0e66 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs @@ -35,6 +35,7 @@ using System.Reflection; using System.Timers; using System.Xml; using libsecondlife; +using Mono.Addins; using Nwc.XmlRpc; using Nini.Config; using OpenSim.Framework; @@ -43,8 +44,13 @@ using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; using OpenSim.Region.Environment.Scenes; +// [assembly : Addin] +// [assembly : AddinDependency("OpenSim", "0.5")] + namespace OpenSim.ApplicationPlugins.Rest { + + // [Extension("/OpenSim/Startup")] public abstract class RestPlugin : IApplicationPlugin { #region properties -- cgit v1.1