diff options
| author | Melanie | 2011-04-17 18:42:06 +0200 |
|---|---|---|
| committer | Melanie | 2011-04-17 18:42:06 +0200 |
| commit | c02e0e930d078ab5e2d4070df65c3d74f5812cbc (patch) | |
| tree | abb12e192cf0675b675d874eb86b65aa4fd177d7 /OpenSim/Services/Connectors/Grid | |
| parent | Fix the cert validation handler so that it will not block other parts of (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.zip opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.gz opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.bz2 opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Grid')
| -rw-r--r-- | OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 5092d74..e57f28b 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |||
| @@ -33,7 +33,6 @@ using System.Reflection; | |||
| 33 | using Nini.Config; | 33 | using Nini.Config; |
| 34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
| 35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
| 36 | using OpenSim.Framework.Servers.HttpServer; | ||
| 37 | using OpenSim.Services.Interfaces; | 36 | using OpenSim.Services.Interfaces; |
| 38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 37 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
| 39 | using OpenSim.Server.Base; | 38 | using OpenSim.Server.Base; |