Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 8 insertions, 4 deletions

diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
index c0933a8..d6ef22e 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -36,6 +36,7 @@ using OpenSim.Server.Handlers.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
@@ -148,11 +149,14 @@ namespace OpenSim.Server.Handlers.Neighbour
             }
 
             // Finally!
-            bool success = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
-
+            GridRegion thisRegion = m_NeighbourService.HelloNeighbour(regionhandle, aRegion);
+            
             OSDMap resp = new OSDMap(1);
 
-            resp["success"] = OSD.FromBoolean(success);
+            if (thisRegion != null)
+                resp["success"] = OSD.FromBoolean(true);
+            else
+                resp["success"] = OSD.FromBoolean(false);
 
             httpResponse.StatusCode = (int)HttpStatusCode.OK;
 
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
index b3a91cf..ac2e75f 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Neighbour
         private IAuthenticationService m_AuthenticationService = null;
 
         public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
-                base(source, server)
+                base(source, server, String.Empty)
         {
 
             m_NeighbourService = nService;