aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest
diff options
context:
space:
mode:
authorCharles Krinke2008-07-11 02:04:02 +0000
committerCharles Krinke2008-07-11 02:04:02 +0000
commitcda526939145d92794eb14554ef43badaf06c149 (patch)
treeb152e13ae8925f5d7ec850bdfac847a0fe472ab9 /OpenSim/ApplicationPlugins/Rest
parentMantis#1541. Thank you kindly, Phrearch for a patch that: (diff)
downloadopensim-SC_OLD-cda526939145d92794eb14554ef43badaf06c149.zip
opensim-SC_OLD-cda526939145d92794eb14554ef43badaf06c149.tar.gz
opensim-SC_OLD-cda526939145d92794eb14554ef43badaf06c149.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs7
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs6
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs6
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;
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")]
35 39
36namespace OpenSim.ApplicationPlugins.Rest.Inventory 40namespace 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;
37using System.Xml; 37using System.Xml;
38using System.Xml.Serialization; 38using System.Xml.Serialization;
39using libsecondlife; 39using libsecondlife;
40using Mono.Addins;
40using Nwc.XmlRpc; 41using Nwc.XmlRpc;
41using Nini.Config; 42using Nini.Config;
42using OpenSim.Framework; 43using 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;
37using System.Xml; 37using System.Xml;
38using System.Xml.Serialization; 38using System.Xml.Serialization;
39using libsecondlife; 39using libsecondlife;
40using Mono.Addins;
40using Nwc.XmlRpc; 41using Nwc.XmlRpc;
41using Nini.Config; 42using Nini.Config;
42using OpenSim.Framework; 43using 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;
37using System.Xml; 37using System.Xml;
38using System.Xml.Serialization; 38using System.Xml.Serialization;
39using libsecondlife; 39using libsecondlife;
40using Mono.Addins;
40using Nwc.XmlRpc; 41using Nwc.XmlRpc;
41using Nini.Config; 42using Nini.Config;
42using OpenSim.Framework; 43using OpenSim.Framework;
@@ -46,8 +47,13 @@ using OpenSim.Framework.Communications;
46using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Environment.Scenes;
47using OpenSim.ApplicationPlugins.Rest; 48using OpenSim.ApplicationPlugins.Rest;
48 49
50[assembly : Addin]
51[assembly : AddinDependency("OpenSim", "0.5")]
52
49namespace OpenSim.ApplicationPlugins.Rest.Regions 53namespace 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;
35using System.Timers; 35using System.Timers;
36using System.Xml; 36using System.Xml;
37using libsecondlife; 37using libsecondlife;
38using Mono.Addins;
38using Nwc.XmlRpc; 39using Nwc.XmlRpc;
39using Nini.Config; 40using Nini.Config;
40using OpenSim.Framework; 41using OpenSim.Framework;
@@ -43,8 +44,13 @@ using OpenSim.Framework.Servers;
43using OpenSim.Framework.Communications; 44using OpenSim.Framework.Communications;
44using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Environment.Scenes;
45 46
47// [assembly : Addin]
48// [assembly : AddinDependency("OpenSim", "0.5")]
49
46namespace OpenSim.ApplicationPlugins.Rest 50namespace 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