diff options
author | Charles Krinke | 2009-05-12 03:30:37 +0000 |
---|---|---|
committer | Charles Krinke | 2009-05-12 03:30:37 +0000 |
commit | c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee (patch) | |
tree | ff2c7eb3d841bceb24dc01fa4d8e8c5261f33a5e /OpenSim/Region/Communications | |
parent | Changes to the new user system to add the modularity developed for the asset (diff) | |
download | opensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.zip opensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.gz opensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.bz2 opensim-SC_OLD-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.xz |
Thank you kindly, Patnad, for a patch that:
This is to handle the changes in the v1.23 viewer
of LL regarding the adult rating. With this patch
a region can be changed to the adult rating from
LL viewer v1.23 and above.
Diffstat (limited to 'OpenSim/Region/Communications')
3 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index 8adc599..3c1be0b 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | |||
@@ -335,7 +335,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
335 | // m_log.Debug("ImgID: " + map.MapImageId); | 335 | // m_log.Debug("ImgID: " + map.MapImageId); |
336 | map.Agents = 1; | 336 | map.Agents = 1; |
337 | map.RegionFlags = 72458694; | 337 | map.RegionFlags = 72458694; |
338 | map.Access = 13; | 338 | map.Access = regInfo.AccessLevel; |
339 | neighbours.Add(map); | 339 | neighbours.Add(map); |
340 | } | 340 | } |
341 | } | 341 | } |
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 2760b1e..50605e8 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -269,7 +269,7 @@ namespace OpenSim.Region.Communications.Local | |||
269 | map.MapImageId = regInfo.RegionSettings.TerrainImageID; | 269 | map.MapImageId = regInfo.RegionSettings.TerrainImageID; |
270 | map.Agents = 1; | 270 | map.Agents = 1; |
271 | map.RegionFlags = 72458694; | 271 | map.RegionFlags = 72458694; |
272 | map.Access = 13; | 272 | map.Access = regInfo.AccessLevel; |
273 | mapBlocks.Add(map); | 273 | mapBlocks.Add(map); |
274 | } | 274 | } |
275 | } | 275 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 3153435..4ffb36f 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -140,6 +140,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
140 | else | 140 | else |
141 | GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); | 141 | GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); |
142 | 142 | ||
143 | GridParams["maturity"] = regionInfo.RegionSettings.Maturity.ToString(); | ||
144 | |||
143 | // Package into an XMLRPC Request | 145 | // Package into an XMLRPC Request |
144 | ArrayList SendParams = new ArrayList(); | 146 | ArrayList SendParams = new ArrayList(); |
145 | SendParams.Add(GridParams); | 147 | SendParams.Add(GridParams); |