aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/GridManager.cs
diff options
context:
space:
mode:
authorHomer Horwitz2008-12-05 17:31:20 +0000
committerHomer Horwitz2008-12-05 17:31:20 +0000
commit33d7913341b5a11c43a091f9286bda8104ea3c11 (patch)
treefbfb1f34ddee974cdb7c4f8b189cfb1ecf5c1be3 /OpenSim/Grid/GridServer/GridManager.cs
parentImplementation of the llDetectedTouch* functions (diff)
downloadopensim-SC_OLD-33d7913341b5a11c43a091f9286bda8104ea3c11.zip
opensim-SC_OLD-33d7913341b5a11c43a091f9286bda8104ea3c11.tar.gz
opensim-SC_OLD-33d7913341b5a11c43a091f9286bda8104ea3c11.tar.bz2
opensim-SC_OLD-33d7913341b5a11c43a091f9286bda8104ea3c11.tar.xz
- 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.
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs5
1 files changed, 4 insertions, 1 deletions
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
880 simProfileBlock["sim_port"] = aSim.serverPort.ToString(); 880 simProfileBlock["sim_port"] = aSim.serverPort.ToString();
881 simProfileBlock["sim_uri"] = aSim.serverURI.ToString(); 881 simProfileBlock["sim_uri"] = aSim.serverURI.ToString();
882 simProfileBlock["uuid"] = aSim.UUID.ToString(); 882 simProfileBlock["uuid"] = aSim.UUID.ToString();
883 simProfileBlock["remoting_port"] = aSim.remotingPort; 883 simProfileBlock["remoting_port"] = aSim.remotingPort.ToString();
884 simProfileBlock["http_port"] = aSim.httpPort.ToString();
884 885
885 simProfileList.Add(simProfileBlock); 886 simProfileList.Add(simProfileBlock);
886 } 887 }
@@ -914,6 +915,8 @@ namespace OpenSim.Grid.GridServer
914 simProfileBlock["sim_port"] = simProfile.serverPort.ToString(); 915 simProfileBlock["sim_port"] = simProfile.serverPort.ToString();
915 simProfileBlock["sim_uri"] = simProfile.serverURI.ToString(); 916 simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();
916 simProfileBlock["uuid"] = simProfile.UUID.ToString(); 917 simProfileBlock["uuid"] = simProfile.UUID.ToString();
918 simProfileBlock["remoting_port"] = simProfile.remotingPort.ToString();
919 simProfileBlock["http_port"] = simProfile.httpPort;
917 920
918 simProfileList.Add(simProfileBlock); 921 simProfileList.Add(simProfileBlock);
919 } 922 }