diff options
author | Homer Horwitz | 2009-04-05 17:08:01 +0000 |
---|---|---|
committer | Homer Horwitz | 2009-04-05 17:08:01 +0000 |
commit | 50aa775ea75528e1cdd9d7ea0d1b6f101eb37910 (patch) | |
tree | 371ebc5f245883b0295466591e7bdbcbc48326a7 | |
parent | Adding migrations for MySQL and SQLite for removing the "old" cloud image. (diff) | |
download | opensim-SC_OLD-50aa775ea75528e1cdd9d7ea0d1b6f101eb37910.zip opensim-SC_OLD-50aa775ea75528e1cdd9d7ea0d1b6f101eb37910.tar.gz opensim-SC_OLD-50aa775ea75528e1cdd9d7ea0d1b6f101eb37910.tar.bz2 opensim-SC_OLD-50aa775ea75528e1cdd9d7ea0d1b6f101eb37910.tar.xz |
- Move IWindModule to OpenSim.Region.Framework.Interfaces
- Fix a dependency problem.
Hopefully fixes Mantis #3395
-rw-r--r-- | OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs (renamed from OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs) | 2 | ||||
-rw-r--r-- | bin/OpenSim.addin.xml | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index 2942792..cd71487 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs | |||
@@ -32,6 +32,7 @@ using System.Reflection; | |||
32 | using log4net; | 32 | using log4net; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | 34 | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
35 | using OpenSim.Region.CoreModules.World.Wind; | 36 | using OpenSim.Region.CoreModules.World.Wind; |
36 | 37 | ||
37 | namespace OpenSim.Region.CoreModules.World.Wind.Plugins | 38 | namespace OpenSim.Region.CoreModules.World.Wind.Plugins |
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs index 8d35a71..cdd5a2e 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs | |||
@@ -30,6 +30,8 @@ using System.Collections.Generic; | |||
30 | 30 | ||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | using OpenSim.Region.Framework.Interfaces; | ||
34 | |||
33 | namespace OpenSim.Region.CoreModules.World.Wind.Plugins | 35 | namespace OpenSim.Region.CoreModules.World.Wind.Plugins |
34 | { | 36 | { |
35 | class SimpleRandomWind : Mono.Addins.TypeExtensionNode, IWindModelPlugin | 37 | class SimpleRandomWind : Mono.Addins.TypeExtensionNode, IWindModelPlugin |
diff --git a/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs index 8e3e810..b087c8b 100644 --- a/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs +++ b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.CoreModules.World.Wind | 36 | namespace OpenSim.Region.Framework.Interfaces |
37 | { | 37 | { |
38 | public interface IWindModelPlugin : IPlugin | 38 | public interface IWindModelPlugin : IPlugin |
39 | { | 39 | { |
diff --git a/bin/OpenSim.addin.xml b/bin/OpenSim.addin.xml index e026e24..ff92555 100644 --- a/bin/OpenSim.addin.xml +++ b/bin/OpenSim.addin.xml | |||
@@ -2,6 +2,8 @@ | |||
2 | <Runtime> | 2 | <Runtime> |
3 | <Import assembly="OpenSim.exe"/> | 3 | <Import assembly="OpenSim.exe"/> |
4 | <Import assembly="OpenSim.Framework.dll"/> | 4 | <Import assembly="OpenSim.Framework.dll"/> |
5 | <Import assembly="OpenSim.Region.Framework.dll"/> | ||
6 | <Import assembly="Mono.Addins.dll"/> | ||
5 | </Runtime> | 7 | </Runtime> |
6 | <ExtensionPoint path="/OpenSim/Startup"> | 8 | <ExtensionPoint path="/OpenSim/Startup"> |
7 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.IApplicationPlugin"/> | 9 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.IApplicationPlugin"/> |
@@ -13,6 +15,6 @@ | |||
13 | <ExtensionNode name="AssetClient" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetServer"/> | 15 | <ExtensionNode name="AssetClient" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetServer"/> |
14 | </ExtensionPoint> | 16 | </ExtensionPoint> |
15 | <ExtensionPoint path="/OpenSim/WindModule" name="Wind Module Plugins for wind models"> | 17 | <ExtensionPoint path="/OpenSim/WindModule" name="Wind Module Plugins for wind models"> |
16 | <ExtensionNode name="WindModel" type="Mono.Addins.TypeExtensionNode" objectType="OpenSim.Region.CoreModules.World.Wind.IWindModelPlugin"/> | 18 | <ExtensionNode name="WindModel" type="Mono.Addins.TypeExtensionNode" objectType="OpenSim.Region.Framework.Interfaces.IWindModelPlugin"/> |
17 | </ExtensionPoint> | 19 | </ExtensionPoint> |
18 | </Addin> | 20 | </Addin> |