diff options
author | Charles Krinke | 2008-07-11 02:04:02 +0000 |
---|---|---|
committer | Charles Krinke | 2008-07-11 02:04:02 +0000 |
commit | cda526939145d92794eb14554ef43badaf06c149 (patch) | |
tree | b152e13ae8925f5d7ec850bdfac847a0fe472ab9 /OpenSim/ApplicationPlugins/Rest | |
parent | Mantis#1541. Thank you kindly, Phrearch for a patch that: (diff) | |
download | opensim-SC-cda526939145d92794eb14554ef43badaf06c149.zip opensim-SC-cda526939145d92794eb14554ef43badaf06c149.tar.gz opensim-SC-cda526939145d92794eb14554ef43badaf06c149.tar.bz2 opensim-SC-cda526939145d92794eb14554ef43badaf06c149.tar.xz |
Mantis#1682. Revert temporarily, Sempuki's mono addins patch
while he studies the issues in Windows a little bit.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
5 files changed, 21 insertions, 0 deletions
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; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
34 | using OpenSim.ApplicationPlugins.Rest; | 34 | using OpenSim.ApplicationPlugins.Rest; |
35 | using Mono.Addins; | ||
36 | |||
37 | [assembly : Addin] | ||
38 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
35 | 39 | ||
36 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 40 | namespace OpenSim.ApplicationPlugins.Rest.Inventory |
37 | { | 41 | { |
42 | |||
43 | [Extension("/OpenSim/Startup")] | ||
44 | |||
38 | public class RestHandler : RestPlugin, IHttpAgentHandler | 45 | public class RestHandler : RestPlugin, IHttpAgentHandler |
39 | { | 46 | { |
40 | 47 | ||
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; | |||
37 | using System.Xml; | 37 | using System.Xml; |
38 | using System.Xml.Serialization; | 38 | using System.Xml.Serialization; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using Mono.Addins; | ||
40 | using Nwc.XmlRpc; | 41 | using Nwc.XmlRpc; |
41 | using Nini.Config; | 42 | using Nini.Config; |
42 | using OpenSim.Framework; | 43 | 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; | |||
37 | using System.Xml; | 37 | using System.Xml; |
38 | using System.Xml.Serialization; | 38 | using System.Xml.Serialization; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using Mono.Addins; | ||
40 | using Nwc.XmlRpc; | 41 | using Nwc.XmlRpc; |
41 | using Nini.Config; | 42 | using Nini.Config; |
42 | using OpenSim.Framework; | 43 | 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; | |||
37 | using System.Xml; | 37 | using System.Xml; |
38 | using System.Xml.Serialization; | 38 | using System.Xml.Serialization; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using Mono.Addins; | ||
40 | using Nwc.XmlRpc; | 41 | using Nwc.XmlRpc; |
41 | using Nini.Config; | 42 | using Nini.Config; |
42 | using OpenSim.Framework; | 43 | using OpenSim.Framework; |
@@ -46,8 +47,13 @@ using OpenSim.Framework.Communications; | |||
46 | using OpenSim.Region.Environment.Scenes; | 47 | using OpenSim.Region.Environment.Scenes; |
47 | using OpenSim.ApplicationPlugins.Rest; | 48 | using OpenSim.ApplicationPlugins.Rest; |
48 | 49 | ||
50 | [assembly : Addin] | ||
51 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
52 | |||
49 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 53 | namespace OpenSim.ApplicationPlugins.Rest.Regions |
50 | { | 54 | { |
55 | |||
56 | [Extension("/OpenSim/Startup")] | ||
51 | public partial class RestRegionPlugin : RestPlugin | 57 | public partial class RestRegionPlugin : RestPlugin |
52 | { | 58 | { |
53 | private static XmlSerializerNamespaces _xmlNs; | 59 | 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; | |||
35 | using System.Timers; | 35 | using System.Timers; |
36 | using System.Xml; | 36 | using System.Xml; |
37 | using libsecondlife; | 37 | using libsecondlife; |
38 | using Mono.Addins; | ||
38 | using Nwc.XmlRpc; | 39 | using Nwc.XmlRpc; |
39 | using Nini.Config; | 40 | using Nini.Config; |
40 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
@@ -43,8 +44,13 @@ using OpenSim.Framework.Servers; | |||
43 | using OpenSim.Framework.Communications; | 44 | using OpenSim.Framework.Communications; |
44 | using OpenSim.Region.Environment.Scenes; | 45 | using OpenSim.Region.Environment.Scenes; |
45 | 46 | ||
47 | // [assembly : Addin] | ||
48 | // [assembly : AddinDependency("OpenSim", "0.5")] | ||
49 | |||
46 | namespace OpenSim.ApplicationPlugins.Rest | 50 | namespace OpenSim.ApplicationPlugins.Rest |
47 | { | 51 | { |
52 | |||
53 | // [Extension("/OpenSim/Startup")] | ||
48 | public abstract class RestPlugin : IApplicationPlugin | 54 | public abstract class RestPlugin : IApplicationPlugin |
49 | { | 55 | { |
50 | #region properties | 56 | #region properties |