aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2014-12-30 07:58:42 -0800
committerDiva Canto2014-12-30 07:58:42 -0800
commit5cf6a6f8302b4f03d45c21f0731978da1d3ddcab (patch)
treec185a144270d8c06b45779a79b0aceb478876515 /OpenSim/Region
parentUpdated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number ... (diff)
downloadopensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.zip
opensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.tar.gz
opensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.tar.bz2
opensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.tar.xz
WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT.
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1 Additional changes: - Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing. - Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/IApplicationPlugin.cs2
-rw-r--r--OpenSim/Region/Application/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs3
-rw-r--r--OpenSim/Region/Framework/Properties/AssemblyInfo.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/UserStatistics/WebStatsModule.cs2
10 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 6e6d48c..a3fa66c 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -26,12 +26,14 @@
26 */ 26 */
27 27
28using OpenSim.Framework; 28using OpenSim.Framework;
29using Mono.Addins;
29 30
30namespace OpenSim 31namespace OpenSim
31{ 32{
32 /// <summary> 33 /// <summary>
33 /// OpenSimulator Application Plugin framework interface 34 /// OpenSimulator Application Plugin framework interface
34 /// </summary> 35 /// </summary>
36 [TypeExtensionPoint(NodeName="Plugin", NodeType = typeof(PluginExtensionNode), Path="/OpenSim/Startup")]
35 public interface IApplicationPlugin : IPlugin 37 public interface IApplicationPlugin : IPlugin
36 { 38 {
37 /// <summary> 39 /// <summary>
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index 45d89c8..3e61575 100644
--- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4using Mono.Addins;
4 5
5// General Information about an assembly is controlled through the following 6// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 7// set of attributes. Change these attribute values to modify the information
@@ -30,3 +31,6 @@ using System.Runtime.InteropServices;
30// Revision 31// Revision
31// 32//
32[assembly: AssemblyVersion("0.8.1.*")] 33[assembly: AssemblyVersion("0.8.1.*")]
34
35[assembly: AddinRoot("OpenSim", "0.8.1")]
36[assembly: ImportAddinAssembly("Opensim.Framework.dll")]
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index 9a0a5d5..b05af22 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Scenes;
41using Caps = OpenSim.Framework.Capabilities.Caps; 41using Caps = OpenSim.Framework.Capabilities.Caps;
42 42
43[assembly: Addin("LindenCaps", "0.1")] 43[assembly: Addin("LindenCaps", "0.1")]
44[assembly: AddinDependency("OpenSim", "0.8.1")] 44[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
45namespace OpenSim.Region.ClientStack.Linden 45namespace OpenSim.Region.ClientStack.Linden
46{ 46{
47 47
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 8b832a1..8cafa12 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@ using Mono.Addins;
34 34
35 35
36[assembly: Addin("OpenSim.Region.CoreModules", "0.1")] 36[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
37[assembly: AddinDependency("OpenSim", "0.8.1")] 37[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
38 38
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 8bcb178..9d3ae5e 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
44 44
45[assembly: Addin("DataSnapshot", "0.1")] 45[assembly: Addin("DataSnapshot", "0.1")]
46[assembly: AddinDependency("OpenSim", "0.8.1")] 46[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
47 47
48namespace OpenSim.Region.DataSnapshot 48namespace OpenSim.Region.DataSnapshot
49{ 49{
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
index 9b1e4ca..2089bce 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
@@ -32,6 +32,7 @@ using OpenSim.Region.Framework.Scenes;
32 32
33namespace OpenSim.Region.Framework.Interfaces 33namespace OpenSim.Region.Framework.Interfaces
34{ 34{
35 [TypeExtensionPoint(Path = "/OpenSim/RegionModules", NodeName="RegionModule")]
35 public interface IRegionModuleBase 36 public interface IRegionModuleBase
36 { 37 {
37 /// <value> 38 /// <value>
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
index b087c8b..16b6024 100644
--- a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
@@ -33,8 +33,11 @@ using OpenSim.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36using Mono.Addins;
37
36namespace OpenSim.Region.Framework.Interfaces 38namespace OpenSim.Region.Framework.Interfaces
37{ 39{
40 [TypeExtensionPoint(Path = "/OpenSim/WindModule", NodeName = "WindModel")]
38 public interface IWindModelPlugin : IPlugin 41 public interface IWindModelPlugin : IPlugin
39 { 42 {
40 /// <summary> 43 /// <summary>
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
index 3692e28..6fe2892 100644
--- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4using Mono.Addins;
4 5
5// General Information about an assembly is controlled through the following 6// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 7// set of attributes. Change these attribute values to modify the information
@@ -22,6 +23,7 @@ using System.Runtime.InteropServices;
22// The following GUID is for the ID of the typelib if this project is exposed to COM 23// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("d25e7aed-7f55-4bb8-9970-0d7d978ea8a5")] 24[assembly: Guid("d25e7aed-7f55-4bb8-9970-0d7d978ea8a5")]
24 25
26
25// Version information for an assembly consists of the following four values: 27// Version information for an assembly consists of the following four values:
26// 28//
27// Major Version 29// Major Version
@@ -30,4 +32,5 @@ using System.Runtime.InteropServices;
30// Revision 32// Revision
31// 33//
32[assembly: AssemblyVersion("0.8.1.*")] 34[assembly: AssemblyVersion("0.8.1.*")]
35[assembly: AddinRoot("OpenSim.Region.Framework", "0.8.1")]
33 36
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index 2fd412c..3f53229 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
@@ -34,4 +34,4 @@ using Mono.Addins;
34 34
35 35
36[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")] 36[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
37[assembly: AddinDependency("OpenSim", "0.8.1")] 37[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 7e57e64..57a2502 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -51,7 +51,7 @@ using OSD = OpenMetaverse.StructuredData.OSD;
51using OSDMap = OpenMetaverse.StructuredData.OSDMap; 51using OSDMap = OpenMetaverse.StructuredData.OSDMap;
52 52
53[assembly: Addin("WebStats", "1.0")] 53[assembly: Addin("WebStats", "1.0")]
54[assembly: AddinDependency("OpenSim", "0.8.1")] 54[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
55 55
56namespace OpenSim.Region.UserStatistics 56namespace OpenSim.Region.UserStatistics
57{ 57{