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

1 files changed, 28 insertions, 1 deletions

diff --git a/prebuild.xml b/prebuild.xml
index 2f67c60..48c4093 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -650,6 +650,29 @@
       </Files>
     </Project>
 
+    <Project name="OpenSim.Region.Interfaces" path="OpenSim/Region/Interfaces" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Runtime.Remoting"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="libsecondlife.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
     <!-- OpenSim.Framework.Communications -->
     <Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
       <Configuration name="Debug">
@@ -668,12 +691,12 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Web"/>
       <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Region.Environment"/>
       <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/>
       <Reference name="OpenSim.Data" />
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Region.Interfaces"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="Nini.dll" />
       <Reference name="XMLRPC.dll"/>
@@ -768,6 +791,7 @@
       <Reference name="Axiom.MathLib.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Data" />
+      <Reference name="OpenSim.Region.Interfaces" />
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Statistics"/>
@@ -1575,6 +1599,7 @@
       <Reference name="OpenSim" />
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.Interfaces" />
       <Reference name="OpenSim.Region.Environment" />
       <Reference name="OpenSim.Region.Physics.Manager" />
       <Reference name="OpenSim.Framework.Console"/>
@@ -1665,6 +1690,7 @@
       <Reference name="OpenSim" />
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.Interfaces" />
       <Reference name="OpenSim.Region.Environment" />
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -1888,6 +1914,7 @@
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Region.Environment" />
+      <Reference name="OpenSim.Region.Interfaces" />
       <Reference name="OpenSim.Region.Physics.Manager" />
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="Axiom.MathLib.dll" localCopy="false"/>