aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-14 01:39:36 +0000
committerMelanie Thielker2008-07-14 01:39:36 +0000
commit07bd749ac56dc498610fc88e61cc7ab04047620e (patch)
tree7e1e8f017f1abe0f3dcc21c29bbae7bafb4b456f /OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
parentPatch #9149 (diff)
downloadopensim-SC-07bd749ac56dc498610fc88e61cc7ab04047620e.zip
opensim-SC-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.gz
opensim-SC-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.bz2
opensim-SC-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.xz
Patch #9150
Patch 7 of the region patches. Finish off the region parts of the estate dialog. Full user functionality. Terrain textures, heights, water, avatar counts, prim bonus, debug settings and region toggles can now be set from the dialog on a per-region basis. Estate stuff defaults to sane values where there are no defaults, to estate_settings.xml otherwise. Sun still b0rked :(
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 2192d12..6f4a563 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Communications.OGS1
118 GridParams["sim_name"] = regionInfo.RegionName; 118 GridParams["sim_name"] = regionInfo.RegionName;
119 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); 119 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
120 GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); 120 GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
121 GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString(); 121 GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
122 GridParams["originUUID"] = regionInfo.originRegionID.ToString(); 122 GridParams["originUUID"] = regionInfo.originRegionID.ToString();
123 GridParams["server_uri"] = regionInfo.ServerURI; 123 GridParams["server_uri"] = regionInfo.ServerURI;
124 GridParams["region_secret"] = regionInfo.regionSecret; 124 GridParams["region_secret"] = regionInfo.regionSecret;