aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/InterGrid
diff options
context:
space:
mode:
authorCharles Krinke2009-05-12 03:30:37 +0000
committerCharles Krinke2009-05-12 03:30:37 +0000
commitc1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee (patch)
treeff2c7eb3d841bceb24dc01fa4d8e8c5261f33a5e /OpenSim/Region/CoreModules/InterGrid
parentChanges to the new user system to add the modularity developed for the asset (diff)
downloadopensim-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/CoreModules/InterGrid')
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs14
1 files changed, 13 insertions, 1 deletions
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();