diff options
author | Justin Clarke Casey | 2008-08-16 20:42:43 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-08-16 20:42:43 +0000 |
commit | 992b04a23e19d3e5a4f88169ce33c9b2ddb4f4de (patch) | |
tree | d816d9da2663ab3f26380d4ac52daae61948cf25 /OpenSim | |
parent | * minor: rip out userserver stress project which never got filled out (diff) | |
download | opensim-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.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
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; | |||
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | 38 | ||
39 | namespace OpenSim.Common.Communications | 39 | namespace 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; | |||
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Framework.Statistics; | 41 | using OpenSim.Framework.Statistics; |
42 | using OpenSim.Common.Communications; | ||
43 | using OpenSim.Grid.Communications.OGS1; | 42 | using OpenSim.Grid.Communications.OGS1; |
44 | 43 | ||
45 | namespace OpenSim.Grid.UserServer | 44 | 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; | |||
36 | using log4net; | 36 | using log4net; |
37 | using Nini.Config; | 37 | using Nini.Config; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications; | ||
39 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Framework.Console; | 41 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Servers; | 42 | using OpenSim.Framework.Servers; |
42 | using OpenSim.Framework.Statistics; | 43 | using OpenSim.Framework.Statistics; |
43 | using OpenSim.Common.Communications; | ||
44 | using OpenSim.Region.ClientStack; | 44 | using OpenSim.Region.ClientStack; |
45 | using OpenSim.Region.Communications.Local; | 45 | using OpenSim.Region.Communications.Local; |
46 | using OpenSim.Region.Communications.OGS1; | 46 | using OpenSim.Region.Communications.OGS1; |