mirror of
https://github.com/opensim/opensim.git
synced 2026-08-04 16:22:50 +08:00
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
This commit is contained in:
@@ -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>();
|
||||
|
||||
|
||||
@@ -63,5 +63,7 @@ namespace OpenSim.Framework
|
||||
bool PresenceChildStatus(LLUUID avatarID);
|
||||
|
||||
string GetCapsPath(LLUUID agentId);
|
||||
|
||||
T RequestModuleInterface<T>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user