From 33d7913341b5a11c43a091f9286bda8104ea3c11 Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Fri, 5 Dec 2008 17:31:20 +0000 Subject: - Fixed missing ToString() in map_blocks response in grid-server - Added remoting_port to the non-fast if-branch, too - Added httpPort field to map_blocks response. This isn't needed yet, but will be for correct crossing between regions. Note: This touches the GridServer. --- OpenSim/Grid/GridServer/GridManager.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 9ab0413..c60334b 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -880,7 +880,8 @@ namespace OpenSim.Grid.GridServer simProfileBlock["sim_port"] = aSim.serverPort.ToString(); simProfileBlock["sim_uri"] = aSim.serverURI.ToString(); simProfileBlock["uuid"] = aSim.UUID.ToString(); - simProfileBlock["remoting_port"] = aSim.remotingPort; + simProfileBlock["remoting_port"] = aSim.remotingPort.ToString(); + simProfileBlock["http_port"] = aSim.httpPort.ToString(); simProfileList.Add(simProfileBlock); } @@ -914,6 +915,8 @@ namespace OpenSim.Grid.GridServer simProfileBlock["sim_port"] = simProfile.serverPort.ToString(); simProfileBlock["sim_uri"] = simProfile.serverURI.ToString(); simProfileBlock["uuid"] = simProfile.UUID.ToString(); + simProfileBlock["remoting_port"] = simProfile.remotingPort.ToString(); + simProfileBlock["http_port"] = simProfile.httpPort; simProfileList.Add(simProfileBlock); } -- cgit v1.1