aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-08-16 20:42:43 +0000
committerJustin Clarke Casey2008-08-16 20:42:43 +0000
commit992b04a23e19d3e5a4f88169ce33c9b2ddb4f4de (patch)
treed816d9da2663ab3f26380d4ac52daae61948cf25 /OpenSim
parent* minor: rip out userserver stress project which never got filled out (diff)
downloadopensim-SC-992b04a23e19d3e5a4f88169ce33c9b2ddb4f4de.zip
opensim-SC-992b04a23e19d3e5a4f88169ce33c9b2ddb4f4de.tar.gz
opensim-SC-992b04a23e19d3e5a4f88169ce33c9b2ddb4f4de.tar.bz2
opensim-SC-992b04a23e19d3e5a4f88169ce33c9b2ddb4f4de.tar.xz
* Move GridInfoService into Framework.Communications and eliminate Common.Communications for now (since this was the only class in that project)
Diffstat (limited to 'OpenSim')
-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
3 files changed, 2 insertions, 3 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;