From ccd74f888bcb2fe60d14d45bfc9506a2c005aa82 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 23 Aug 2008 02:30:07 +0000
Subject: 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

---
 OpenSim/Framework/Communications/Capabilities/Caps.cs | 5 ++---
 OpenSim/Framework/IScene.cs                           | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

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;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Interfaces;
 
 namespace OpenSim.Framework.Communications.Capabilities
 {
@@ -614,7 +613,7 @@ namespace OpenSim.Framework.Communications.Capabilities
                 llsdRequest.asset_type == "sound")
             {
                 IClientAPI client = GetClient(m_agentID);
-                Scene scene = (Scene)client.Scene;
+                IScene scene = client.Scene;
 
                 IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();
 
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 82002c2..2cce12f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -63,5 +63,7 @@ namespace OpenSim.Framework
         bool PresenceChildStatus(LLUUID avatarID);
 
         string GetCapsPath(LLUUID agentId);
+
+        T RequestModuleInterface<T>();
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1