aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-13 22:47:12 +0000
committerTeravus Ovares2008-04-13 22:47:12 +0000
commitbe93c0f29a888db26676347f7011b66dff3d7499 (patch)
tree6647a7fe1c8aaa6e8306ebee4ec960babdf0d0ea /OpenSim/Region/Communications
parent* Temporarily, stop the exception of mantis #951 from killing the entire clie... (diff)
downloadopensim-SC-be93c0f29a888db26676347f7011b66dff3d7499.zip
opensim-SC-be93c0f29a888db26676347f7011b66dff3d7499.tar.gz
opensim-SC-be93c0f29a888db26676347f7011b66dff3d7499.tar.bz2
opensim-SC-be93c0f29a888db26676347f7011b66dff3d7499.tar.xz
* Fix a bug in the friends module that causes a friend not to appear online when they were.
* A few things for testing. * This makes a modification to the region registration with the grid server so that the region can send it a chosen password to identify itself. It will not cause any errors, if either one are not updated.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 22bb0f0..8c40d3e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -112,6 +112,7 @@ namespace OpenSim.Region.Communications.OGS1
112 GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString(); 112 GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString();
113 GridParams["originUUID"] = regionInfo.originRegionID.ToString(); 113 GridParams["originUUID"] = regionInfo.originRegionID.ToString();
114 GridParams["server_uri"] = regionInfo.ServerURI; 114 GridParams["server_uri"] = regionInfo.ServerURI;
115 GridParams["region_secret"] = regionInfo.regionSecret;
115 116
116 // part of an initial brutish effort to provide accurate information (as per the xml region spec) 117 // part of an initial brutish effort to provide accurate information (as per the xml region spec)
117 // wrt the ownership of a given region 118 // wrt the ownership of a given region