diff options
author | Melanie Thielker | 2008-08-23 02:30:07 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-23 02:30:07 +0000 |
commit | ccd74f888bcb2fe60d14d45bfc9506a2c005aa82 (patch) | |
tree | 5b626ffee4fa08aafa60c5397c1a4e154447546c /OpenSim/Region/Environment/Scenes | |
parent | Set svn:eol-style (diff) | |
download | opensim-SC_OLD-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.zip opensim-SC_OLD-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.gz opensim-SC_OLD-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.bz2 opensim-SC_OLD-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.xz |
Some complex re-ordering to make prebuild do what needed to be done.
It is now possible to use module interfaces without referencing Scene.
Place those interfaces in OpenSim/Region/Interfaces. They may not
use any refs from OpenSim.Region.Environment as parameters.
This resolves a circular library ref introduced in r5949
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneBase.cs | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 9c91725..8382467 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -35,6 +35,7 @@ using libsecondlife.Packets; | |||
35 | using log4net; | 35 | using log4net; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Region.Interfaces; | ||
38 | using OpenSim.Region.Environment.Interfaces; | 39 | using OpenSim.Region.Environment.Interfaces; |
39 | 40 | ||
40 | namespace OpenSim.Region.Environment.Scenes | 41 | namespace OpenSim.Region.Environment.Scenes |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index fb2cbb6..3bae463 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2963,7 +2963,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2963 | /// For the given interface, retrieve the region module which implements it. | 2963 | /// For the given interface, retrieve the region module which implements it. |
2964 | /// </summary> | 2964 | /// </summary> |
2965 | /// <returns>null if there is no module implementing that interface</returns> | 2965 | /// <returns>null if there is no module implementing that interface</returns> |
2966 | public T RequestModuleInterface<T>() | 2966 | public override T RequestModuleInterface<T>() |
2967 | { | 2967 | { |
2968 | if (ModuleInterfaces.ContainsKey(typeof(T))) | 2968 | if (ModuleInterfaces.ContainsKey(typeof(T))) |
2969 | { | 2969 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index fbef367..c624a41 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -220,5 +220,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
220 | 220 | ||
221 | return null; | 221 | return null; |
222 | } | 222 | } |
223 | |||
224 | public virtual T RequestModuleInterface<T>() | ||
225 | { | ||
226 | return default(T); | ||
227 | } | ||
223 | } | 228 | } |
224 | } | 229 | } |