aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Neighbour
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-29 23:50:24 -0400
committerTeravus Ovares (Dan Olivares)2009-08-29 23:50:24 -0400
commit2f40161f38967e3362ac7be43b74d5cbc75564fa (patch)
treedb14920568864a932a064a4530d006fc67c60a5f /OpenSim/Server/Handlers/Neighbour
parentOk, merging the RegionCombinerModule with master. (diff)
parentRemove another IAuthentificationInterface user (diff)
downloadopensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.zip
opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.gz
opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.bz2
opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Neighbour')
-rw-r--r--OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
index 3de2245..c0933a8 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -110,12 +110,13 @@ namespace OpenSim.Server.Handlers.Neighbour
110 httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; 110 httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized;
111 return result; 111 return result;
112 } 112 }
113 if (!m_AuthenticationService.VerifyKey(regionID, authToken)) 113 // TODO: Rethink this
114 { 114 //if (!m_AuthenticationService.VerifyKey(regionID, authToken))
115 m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path); 115 //{
116 httpResponse.StatusCode = (int)HttpStatusCode.Forbidden; 116 // m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path);
117 return result; 117 // httpResponse.StatusCode = (int)HttpStatusCode.Forbidden;
118 } 118 // return result;
119 //}
119 m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID); 120 m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID);
120 } 121 }
121 122