aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-12-05 17:31:31 +0000
committerHomer Horwitz2008-12-05 17:31:31 +0000
commit05467cb7803f2ccd8cacb2fc848ea378905e6bfe (patch)
tree6c2c149bfd89a467c4b22f581419727e70e8cb12
parent- Fixed missing ToString() in map_blocks response in grid-server (diff)
downloadopensim-SC-05467cb7803f2ccd8cacb2fc848ea378905e6bfe.zip
opensim-SC-05467cb7803f2ccd8cacb2fc848ea378905e6bfe.tar.gz
opensim-SC-05467cb7803f2ccd8cacb2fc848ea378905e6bfe.tar.bz2
opensim-SC-05467cb7803f2ccd8cacb2fc848ea378905e6bfe.tar.xz
- Use the http-port that is now provided by the grid-server. If it isn't (because GridServer is too old), complain.
Not used yet, but will be necessary for crossing regions correcly.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 0c13120..59250fd 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -301,6 +301,11 @@ namespace OpenSim.Region.Communications.OGS1
301 { 301 {
302 sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]); 302 sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]);
303 } 303 }
304 else
305 {
306 m_log.Error("[OGS1 GRID SERVICES]: Couldn't find httpPort, using default 9000; please upgrade your grid-server to r7621 or later");
307 sri.HttpPort = 9000; // that's the default and will probably be wrong
308 }
304 309
305 sri.RegionID = new UUID((string) neighbourData["uuid"]); 310 sri.RegionID = new UUID((string) neighbourData["uuid"]);
306 311