diff options
author | Mike Mazur | 2008-07-23 03:08:31 +0000 |
---|---|---|
committer | Mike Mazur | 2008-07-23 03:08:31 +0000 |
commit | a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a (patch) | |
tree | 5fabd9a5104c256a874ebfc280b912e46364be50 /OpenSim/ApplicationPlugins/Rest | |
parent | First version of position mapping between LSL <-> C# implemented. (diff) | |
download | opensim-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 'OpenSim/ApplicationPlugins/Rest')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 7 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | 6 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 6 |
3 files changed, 0 insertions, 19 deletions
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; | |||
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")] | ||
39 | 35 | ||
40 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 36 | namespace 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; | |||
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; | ||
41 | using Nwc.XmlRpc; | 40 | using Nwc.XmlRpc; |
42 | using Nini.Config; | 41 | using Nini.Config; |
43 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
@@ -47,13 +46,8 @@ using OpenSim.Framework.Communications; | |||
47 | using OpenSim.Region.Environment.Scenes; | 46 | using OpenSim.Region.Environment.Scenes; |
48 | using OpenSim.ApplicationPlugins.Rest; | 47 | using OpenSim.ApplicationPlugins.Rest; |
49 | 48 | ||
50 | [assembly : Addin] | ||
51 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
52 | |||
53 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 49 | namespace 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; | |||
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; | ||
39 | using Nwc.XmlRpc; | 38 | using Nwc.XmlRpc; |
40 | using Nini.Config; | 39 | using Nini.Config; |
41 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
@@ -44,13 +43,8 @@ using OpenSim.Framework.Servers; | |||
44 | using OpenSim.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
45 | using OpenSim.Region.Environment.Scenes; | 44 | using OpenSim.Region.Environment.Scenes; |
46 | 45 | ||
47 | // [assembly : Addin] | ||
48 | // [assembly : AddinDependency("OpenSim", "0.5")] | ||
49 | |||
50 | namespace OpenSim.ApplicationPlugins.Rest | 46 | namespace 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 |