diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/ApplicationPlugins/RegionModulesController | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/ApplicationPlugins/RegionModulesController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs | 10 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs index acbdc3a..a45abad 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs | |||
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; | |||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | using Mono.Addins; | 4 | using Mono.Addins; |
5 | 5 | ||
6 | // General Information about an assembly is controlled through the following | 6 | // General Information about an assembly is controlled through the following |
7 | // set of attributes. Change these attribute values to modify the information | 7 | // set of attributes. Change these attribute values to modify the information |
8 | // associated with an assembly. | 8 | // associated with an assembly. |
9 | [assembly: AssemblyTitle("OpenSim.ApplicationPlugins.RegionModulesController")] | 9 | [assembly: AssemblyTitle("OpenSim.ApplicationPlugins.RegionModulesController")] |
@@ -15,8 +15,8 @@ using Mono.Addins; | |||
15 | [assembly: AssemblyTrademark("")] | 15 | [assembly: AssemblyTrademark("")] |
16 | [assembly: AssemblyCulture("")] | 16 | [assembly: AssemblyCulture("")] |
17 | 17 | ||
18 | // Setting ComVisible to false makes the types in this assembly not visible | 18 | // Setting ComVisible to false makes the types in this assembly not visible |
19 | // to COM components. If you need to access a type in this assembly from | 19 | // to COM components. If you need to access a type in this assembly from |
20 | // COM, set the ComVisible attribute to true on that type. | 20 | // COM, set the ComVisible attribute to true on that type. |
21 | [assembly: ComVisible(false)] | 21 | [assembly: ComVisible(false)] |
22 | 22 | ||
@@ -26,11 +26,11 @@ using Mono.Addins; | |||
26 | // Version information for an assembly consists of the following four values: | 26 | // Version information for an assembly consists of the following four values: |
27 | // | 27 | // |
28 | // Major Version | 28 | // Major Version |
29 | // Minor Version | 29 | // Minor Version |
30 | // Build Number | 30 | // Build Number |
31 | // Revision | 31 | // Revision |
32 | // | 32 | // |
33 | [assembly: AssemblyVersion("0.8.3.*")] | 33 | [assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)] |
34 | 34 | ||
35 | [assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VersionNumber)] | 35 | [assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VersionNumber)] |
36 | [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)] | 36 | [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)] |
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs index 8f38a29..2e25c60 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
75 | } | 75 | } |
76 | 76 | ||
77 | #region IApplicationPlugin implementation | 77 | #region IApplicationPlugin implementation |
78 | 78 | ||
79 | public void Initialise (OpenSimBase openSim) | 79 | public void Initialise (OpenSimBase openSim) |
80 | { | 80 | { |
81 | m_openSim = openSim; | 81 | m_openSim = openSim; |
@@ -111,7 +111,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
111 | { | 111 | { |
112 | m_log.InfoFormat( | 112 | m_log.InfoFormat( |
113 | "[REGIONMODULES]: From plugin {0}, (version {1}), loaded {2} modules, {3} shared, {4} non-shared {5} unknown", | 113 | "[REGIONMODULES]: From plugin {0}, (version {1}), loaded {2} modules, {3} shared, {4} non-shared {5} unknown", |
114 | loadedModuleData.Key.Id, | 114 | loadedModuleData.Key.Id, |
115 | loadedModuleData.Key.Version, | 115 | loadedModuleData.Key.Version, |
116 | loadedModuleData.Value[0] + loadedModuleData.Value[1] + loadedModuleData.Value[2], | 116 | loadedModuleData.Value[0] + loadedModuleData.Value[1] + loadedModuleData.Value[2], |
117 | loadedModuleData.Value[0], loadedModuleData.Value[1], loadedModuleData.Value[2]); | 117 | loadedModuleData.Value[0], loadedModuleData.Value[1], loadedModuleData.Value[2]); |
@@ -261,7 +261,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
261 | } | 261 | } |
262 | 262 | ||
263 | #region Region Module interfacesController implementation | 263 | #region Region Module interfacesController implementation |
264 | 264 | ||
265 | /// <summary> | 265 | /// <summary> |
266 | /// Check that the given module is no disabled in the [Modules] section of the config files. | 266 | /// Check that the given module is no disabled in the [Modules] section of the config files. |
267 | /// </summary> | 267 | /// </summary> |
@@ -293,10 +293,10 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
293 | if (className != String.Empty && | 293 | if (className != String.Empty && |
294 | node.Type.ToString() != className) | 294 | node.Type.ToString() != className) |
295 | return false; | 295 | return false; |
296 | } | 296 | } |
297 | 297 | ||
298 | return true; | 298 | return true; |
299 | } | 299 | } |
300 | 300 | ||
301 | // The root of all evil. | 301 | // The root of all evil. |
302 | // This is where we handle adding the modules to scenes when they | 302 | // This is where we handle adding the modules to scenes when they |