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/Framework/Communications | |
parent | Set svn:eol-style (diff) | |
download | opensim-SC-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.zip opensim-SC-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.gz opensim-SC-ccd74f888bcb2fe60d14d45bfc9506a2c005aa82.tar.bz2 opensim-SC-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 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 338604d..6946561 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -35,8 +35,7 @@ using log4net; | |||
35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Environment.Interfaces; | 38 | using OpenSim.Region.Interfaces; |
39 | using OpenSim.Region.Environment.Scenes; | ||
40 | 39 | ||
41 | namespace OpenSim.Framework.Communications.Capabilities | 40 | namespace OpenSim.Framework.Communications.Capabilities |
42 | { | 41 | { |
@@ -614,7 +613,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
614 | llsdRequest.asset_type == "sound") | 613 | llsdRequest.asset_type == "sound") |
615 | { | 614 | { |
616 | IClientAPI client = GetClient(m_agentID); | 615 | IClientAPI client = GetClient(m_agentID); |
617 | Scene scene = (Scene)client.Scene; | 616 | IScene scene = client.Scene; |
618 | 617 | ||
619 | IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>(); | 618 | IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>(); |
620 | 619 | ||