ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Thank you kindly, Patnad, for a patch that:

Browse Source 
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.
This commit is contained in:
Charles Krinke
2009-05-12 03:30:37 +00:00
parent 16efb78698
commit c1d680b6c3
14 changed files with 100 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@@ -335,7 +335,7 @@ namespace OpenSim.Region.Communications.Hypergrid
// m_log.Debug("ImgID: " + map.MapImageId);
map.Agents = 1;
map.RegionFlags = 72458694;
map.Access = 13;
map.Access = regInfo.AccessLevel;
neighbours.Add(map);
}
}

2
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@@ -269,7 +269,7 @@ namespace OpenSim.Region.Communications.Local
map.MapImageId = regInfo.RegionSettings.TerrainImageID;
map.Agents = 1;
map.RegionFlags = 72458694;
map.Access = 13;
map.Access = regInfo.AccessLevel;
mapBlocks.Add(map);
}
}

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@@ -140,6 +140,8 @@ namespace OpenSim.Region.Communications.OGS1
else
GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
GridParams["maturity"] = regionInfo.RegionSettings.Maturity.ToString();
// Package into an XMLRPC Request
ArrayList SendParams = new ArrayList();
SendParams.Add(GridParams);

14
OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
View File

@@ -458,7 +458,19 @@ namespace OpenSim.Region.CoreModules.InterGrid
responseMap["region_x"] = OSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX
responseMap["region_y"] = OSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY
responseMap["region_id"] = OSD.FromUUID(reg.originRegionID);
responseMap["sim_access"] = OSD.FromString((reg.RegionSettings.Maturity == 1) ? "Mature" : "PG");
if (reg.RegionSettings.Maturity == 1)
{
responseMap["sim_access"] = OSD.FromString("Mature");
}
else if (reg.RegionSettings.Maturity == 2)
{
responseMap["sim_access"] = OSD.FromString("Adult");
}
else
{
responseMap["sim_access"] = OSD.FromString("PG");
}
// Generate a dummy agent for the user so we can get back a CAPS path
AgentCircuitData agentData = new AgentCircuitData();

16
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -114,8 +114,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (matureLevel <= 13)
m_scene.RegionInfo.RegionSettings.Maturity = 0;
else
else if (matureLevel <= 21)
m_scene.RegionInfo.RegionSettings.Maturity = 1;
else
m_scene.RegionInfo.RegionSettings.Maturity = 2;
if (restrictPushObject)
m_scene.RegionInfo.RegionSettings.RestrictPushing = true;
@@ -580,11 +582,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
args.redirectGridX = m_scene.RegionInfo.EstateSettings.RedirectGridX;
args.redirectGridY = m_scene.RegionInfo.EstateSettings.RedirectGridY;
args.regionFlags = GetRegionFlags();
byte mature = 13;
if (m_scene.RegionInfo.RegionSettings.Maturity == 1)
mature = 21;
args.simAccess = mature;
args.simAccess = m_scene.RegionInfo.AccessLevel;
args.sunHour = (float)m_scene.RegionInfo.RegionSettings.SunPosition;
args.terrainLowerLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainLowerLimit;
args.terrainRaiseLimit = (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit;
@@ -730,12 +728,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
args.terrainHeightRange2 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SE;
args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE;
args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE;
byte mature = 13;
if (m_scene.RegionInfo.RegionSettings.Maturity == 1)
mature = 21;
args.simAccess = mature;
args.simAccess = m_scene.RegionInfo.AccessLevel;
args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
args.regionFlags = GetRegionFlags();
args.regionName = m_scene.RegionInfo.RegionName;
if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)

2
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
View File

@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{
data = new MapBlockData();
data.Agents = 0;
data.Access = 21; // TODO what's this?
data.Access = info.AccessLevel;
data.MapImageId = info.RegionSettings.TerrainImageID;
data.Name = info.RegionName;
data.RegionFlags = 0; // TODO not used?

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -7995,6 +7995,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
reply = "PG";
else if (access == 1)
reply = "MATURE";
else if (access == 2)
reply = "ADULT";
else
reply = "UNKNOWN";
break;