* Move GridInfoService into Framework.Communications and eliminate Common.Communications for now (since this was the only class in that project)

4 files changed, 2 insertions, 28 deletions

diff --git a/OpenSim/Common/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index adaaa95..d51bc59 100644
--- a/OpenSim/Common/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -36,7 +36,7 @@ using Nwc.XmlRpc;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework;
 
-namespace OpenSim.Common.Communications
+namespace OpenSim.Framework.Communications
 {
     public class GridInfoService
     {
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 516efe4..9b74dbc 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -39,7 +39,6 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
-using OpenSim.Common.Communications;
 using OpenSim.Grid.Communications.OGS1;
 
 namespace OpenSim.Grid.UserServer
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ce5b335..0ac8cd7 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -36,11 +36,11 @@ using libsecondlife;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
-using OpenSim.Common.Communications;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
diff --git a/prebuild.xml b/prebuild.xml
index f6acc42..fdf00d5 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -466,31 +466,6 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Common.Communications" path="OpenSim/Common/Communications" 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"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="Nini.dll" />
-      <Reference name="XMLRPC.dll"/>
-      <Reference name="log4net.dll"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
       <Configuration name="Debug">
         <Options>