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 | |
parent | Changes to the new user system to add the modularity developed for the asset (diff) | |
download | opensim-SC-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.zip opensim-SC-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.gz opensim-SC-c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee.tar.bz2 opensim-SC-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 '')
7 files changed, 25 insertions, 15 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); |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index 5278b74..b14e38b 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -458,7 +458,19 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
458 | responseMap["region_x"] = OSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX | 458 | responseMap["region_x"] = OSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX |
459 | responseMap["region_y"] = OSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY | 459 | responseMap["region_y"] = OSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY |
460 | responseMap["region_id"] = OSD.FromUUID(reg.originRegionID); | 460 | responseMap["region_id"] = OSD.FromUUID(reg.originRegionID); |
461 | responseMap["sim_access"] = OSD.FromString((reg.RegionSettings.Maturity == 1) ? "Mature" : "PG"); | 461 | |
462 | if (reg.RegionSettings.Maturity == 1) | ||
463 | { | ||
464 | responseMap["sim_access"] = OSD.FromString("Mature"); | ||
465 | } | ||
466 | else if (reg.RegionSettings.Maturity == 2) | ||
467 | { | ||
468 | responseMap["sim_access"] = OSD.FromString("Adult"); | ||
469 | } | ||
470 | else | ||
471 | { | ||
472 | responseMap["sim_access"] = OSD.FromString("PG"); | ||
473 | } | ||
462 | 474 | ||
463 | // Generate a dummy agent for the user so we can get back a CAPS path | 475 | // Generate a dummy agent for the user so we can get back a CAPS path |
464 | AgentCircuitData agentData = new AgentCircuitData(); | 476 | AgentCircuitData agentData = new AgentCircuitData(); |
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 3bde967..4cfa194 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -114,8 +114,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
114 | 114 | ||
115 | if (matureLevel <= 13) | 115 | if (matureLevel <= 13) |
116 | m_scene.RegionInfo.RegionSettings.Maturity = 0; | 116 | m_scene.RegionInfo.RegionSettings.Maturity = 0; |
117 | else | 117 | else if (matureLevel <= 21) |
118 | m_scene.RegionInfo.RegionSettings.Maturity = 1; | 118 | m_scene.RegionInfo.RegionSettings.Maturity = 1; |
119 | else | ||
120 | m_scene.RegionInfo.RegionSettings.Maturity = 2; | ||
119 | 121 | ||
120 | if (restrictPushObject) | 122 | if (restrictPushObject) |
121 | m_scene.RegionInfo.RegionSettings.RestrictPushing = true; | 123 | m_scene.RegionInfo.RegionSettings.RestrictPushing = true; |
@@ -580,11 +582,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
580 | args.redirectGridX = m_scene.RegionInfo.EstateSettings.RedirectGridX; | 582 | args.redirectGridX = m_scene.RegionInfo.EstateSettings.RedirectGridX; |
581 | args.redirectGridY = m_scene.RegionInfo.EstateSettings.RedirectGridY; | 583 | args.redirectGridY = m_scene.RegionInfo.EstateSettings.RedirectGridY; |
582 | args.regionFlags = GetRegionFlags(); | 584 | args.regionFlags = GetRegionFlags(); |
583 | byte mature = 13; | 585 | args.simAccess = m_scene.RegionInfo.AccessLevel; |
584 | if (m_scene.RegionInfo.RegionSettings.Maturity == 1) | ||
585 | mature = 21; | ||
586 | args.simAccess = mature; | ||
587 | |||
588 | args.sunHour = (float)m_scene.RegionInfo.RegionSettings.SunPosition; | 586 | args.sunHour = (float)m_scene.RegionInfo.RegionSettings.SunPosition; |
589 | args.terrainLowerLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainLowerLimit; | 587 | args.terrainLowerLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainLowerLimit; |
590 | args.terrainRaiseLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit; | 588 | args.terrainRaiseLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit; |
@@ -730,12 +728,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
730 | args.terrainHeightRange2 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SE; | 728 | args.terrainHeightRange2 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SE; |
731 | args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE; | 729 | args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE; |
732 | args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE; | 730 | args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE; |
733 | byte mature = 13; | 731 | args.simAccess = m_scene.RegionInfo.AccessLevel; |
734 | if (m_scene.RegionInfo.RegionSettings.Maturity == 1) | ||
735 | mature = 21; | ||
736 | args.simAccess = mature; | ||
737 | args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; | 732 | args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; |
738 | |||
739 | args.regionFlags = GetRegionFlags(); | 733 | args.regionFlags = GetRegionFlags(); |
740 | args.regionName = m_scene.RegionInfo.RegionName; | 734 | args.regionName = m_scene.RegionInfo.RegionName; |
741 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 735 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 832b6cf..f4fe625 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
126 | { | 126 | { |
127 | data = new MapBlockData(); | 127 | data = new MapBlockData(); |
128 | data.Agents = 0; | 128 | data.Agents = 0; |
129 | data.Access = 21; // TODO what's this? | 129 | data.Access = info.AccessLevel; |
130 | data.MapImageId = info.RegionSettings.TerrainImageID; | 130 | data.MapImageId = info.RegionSettings.TerrainImageID; |
131 | data.Name = info.RegionName; | 131 | data.Name = info.RegionName; |
132 | data.RegionFlags = 0; // TODO not used? | 132 | data.RegionFlags = 0; // TODO not used? |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f9feb7f..8102b2f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7995,6 +7995,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7995 | reply = "PG"; | 7995 | reply = "PG"; |
7996 | else if (access == 1) | 7996 | else if (access == 1) |
7997 | reply = "MATURE"; | 7997 | reply = "MATURE"; |
7998 | else if (access == 2) | ||
7999 | reply = "ADULT"; | ||
7998 | else | 8000 | else |
7999 | reply = "UNKNOWN"; | 8001 | reply = "UNKNOWN"; |
8000 | break; | 8002 | break; |