aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2011-04-17 18:42:06 +0200
committerMelanie2011-04-17 18:42:06 +0200
commitc02e0e930d078ab5e2d4070df65c3d74f5812cbc (patch)
treeabb12e192cf0675b675d874eb86b65aa4fd177d7 /OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
parentFix the cert validation handler so that it will not block other parts of (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.zip
opensim-SC_OLD-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.gz
opensim-SC_OLD-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.bz2
opensim-SC_OLD-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/Presence/PresenceServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
index f1c99ce..e16dc36 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
@@ -33,7 +33,6 @@ using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
38using GridRegion = OpenSim.Services.Interfaces.GridRegion; 37using GridRegion = OpenSim.Services.Interfaces.GridRegion;
39using OpenSim.Server.Base; 38using OpenSim.Server.Base;