aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-23 02:30:07 +0000
committerMelanie Thielker2008-08-23 02:30:07 +0000
commitccd74f888bcb2fe60d14d45bfc9506a2c005aa82 (patch)
tree5b626ffee4fa08aafa60c5397c1a4e154447546c /OpenSim/Framework/Communications/Capabilities
parentSet svn:eol-style (diff)
downloadopensim-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/Capabilities')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs5
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;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Interfaces;
39using OpenSim.Region.Environment.Scenes;
40 39
41namespace OpenSim.Framework.Communications.Capabilities 40namespace 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