aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/GridInfoService.cs (renamed from OpenSim/Common/Communications/GridInfoService.cs)2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--prebuild.xml25
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;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework; 37using OpenSim.Framework;
38 38
39namespace OpenSim.Common.Communications 39namespace OpenSim.Framework.Communications
40{ 40{
41 public class GridInfoService 41 public class GridInfoService
42 { 42 {
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;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42using OpenSim.Common.Communications;
43using OpenSim.Grid.Communications.OGS1; 42using OpenSim.Grid.Communications.OGS1;
44 43
45namespace OpenSim.Grid.UserServer 44namespace 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;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Console; 41using OpenSim.Framework.Console;
41using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
42using OpenSim.Framework.Statistics; 43using OpenSim.Framework.Statistics;
43using OpenSim.Common.Communications;
44using OpenSim.Region.ClientStack; 44using OpenSim.Region.ClientStack;
45using OpenSim.Region.Communications.Local; 45using OpenSim.Region.Communications.Local;
46using OpenSim.Region.Communications.OGS1; 46using 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 @@
466 </Files> 466 </Files>
467 </Project> 467 </Project>
468 468
469 <Project name="OpenSim.Common.Communications" path="OpenSim/Common/Communications" type="Library">
470 <Configuration name="Debug">
471 <Options>
472 <OutputPath>../../../bin/</OutputPath>
473 </Options>
474 </Configuration>
475 <Configuration name="Release">
476 <Options>
477 <OutputPath>../../../bin/</OutputPath>
478 </Options>
479 </Configuration>
480
481 <ReferencePath>../../../bin/</ReferencePath>
482 <Reference name="System"/>
483 <Reference name="OpenSim.Framework"/>
484 <Reference name="OpenSim.Framework.Servers"/>
485 <Reference name="Nini.dll" />
486 <Reference name="XMLRPC.dll"/>
487 <Reference name="log4net.dll"/>
488
489 <Files>
490 <Match pattern="*.cs" recurse="true"/>
491 </Files>
492 </Project>
493
494 <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library"> 469 <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
495 <Configuration name="Debug"> 470 <Configuration name="Debug">
496 <Options> 471 <Options>