aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2009-05-12 03:30:37 +0000
committerCharles Krinke2009-05-12 03:30:37 +0000
commitc1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee (patch)
treeff2c7eb3d841bceb24dc01fa4d8e8c5261f33a5e
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 '')
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs6
-rw-r--r--OpenSim/Data/MySQL/Resources/002_GridStore.sql5
-rw-r--r--OpenSim/Data/RegionProfileData.cs21
-rw-r--r--OpenSim/Data/RegionProfileServiceProxy.cs3
-rw-r--r--OpenSim/Framework/RegionInfo.cs6
-rw-r--r--OpenSim/Framework/Util.cs24
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs17
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs14
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
14 files changed, 100 insertions, 22 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index ad022a5..139d57f 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -436,6 +436,7 @@ namespace OpenSim.Data.MySQL
436 // World Map Addition 436 // World Map Addition
437 UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); 437 UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
438 UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); 438 UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
439 retval.maturity = Convert.ToUInt32(reader["access"]);
439 } 440 }
440 else 441 else
441 { 442 {
@@ -976,13 +977,13 @@ namespace OpenSim.Data.MySQL
976 // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql, 977 // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql,
977 // as well as the related parameterization 978 // as well as the related parameterization
978 sql += 979 sql +=
979 "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID) VALUES "; 980 "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID, access) VALUES ";
980 981
981 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, "; 982 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
982 sql += 983 sql +=
983 "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, "; 984 "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
984 sql += 985 sql +=
985 "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid, ?originUUID)"; 986 "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid, ?originUUID, ?access)";
986 987
987 if (GRID_ONLY_UPDATE_NECESSARY_DATA) 988 if (GRID_ONLY_UPDATE_NECESSARY_DATA)
988 { 989 {
@@ -1023,6 +1024,7 @@ namespace OpenSim.Data.MySQL
1023 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString(); 1024 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
1024 parameters["?owner_uuid"] = regiondata.owner_uuid.ToString(); 1025 parameters["?owner_uuid"] = regiondata.owner_uuid.ToString();
1025 parameters["?originUUID"] = regiondata.originUUID.ToString(); 1026 parameters["?originUUID"] = regiondata.originUUID.ToString();
1027 parameters["?access"] = regiondata.maturity.ToString();
1026 1028
1027 bool returnval = false; 1029 bool returnval = false;
1028 1030
diff --git a/OpenSim/Data/MySQL/Resources/002_GridStore.sql b/OpenSim/Data/MySQL/Resources/002_GridStore.sql
new file mode 100644
index 0000000..bda43d0
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_GridStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE regions add column access integer unsigned default 1;
4
5COMMIT;
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 8ff2184..ed3ecfc 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -131,6 +131,11 @@ namespace OpenSim.Data
131 /// </summary> 131 /// </summary>
132 public UUID originUUID; 132 public UUID originUUID;
133 133
134 /// <summary>
135 /// The Maturity rating of the region
136 /// </summary>
137 public uint maturity;
138
134 139
135 //Data Wrappers 140 //Data Wrappers
136 public string RegionName 141 public string RegionName
@@ -279,6 +284,17 @@ namespace OpenSim.Data
279 get { return originUUID; } 284 get { return originUUID; }
280 set { originUUID = value; } 285 set { originUUID = value; }
281 } 286 }
287 public uint Maturity
288 {
289 get { return maturity; }
290 set { maturity = value; }
291 }
292
293 public byte AccessLevel
294 {
295 get { return Util.ConvertMaturityToAccessLevel(maturity); }
296 }
297
282 298
283 public RegionInfo ToRegionInfo() 299 public RegionInfo ToRegionInfo()
284 { 300 {
@@ -295,10 +311,10 @@ namespace OpenSim.Data
295 return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX, 311 return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX,
296 regionInfo.RegionLocY, regionInfo.ExternalHostName, 312 regionInfo.RegionLocY, regionInfo.ExternalHostName,
297 (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, 313 (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort,
298 regionInfo.ServerURI); 314 regionInfo.ServerURI, regionInfo.AccessLevel);
299 } 315 }
300 316
301 public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri) 317 public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri, byte access)
302 { 318 {
303 RegionProfileData regionProfile; 319 RegionProfileData regionProfile;
304 regionProfile = new RegionProfileData(); 320 regionProfile = new RegionProfileData();
@@ -315,6 +331,7 @@ namespace OpenSim.Data
315 regionProfile.httpServerURI = "http://" + externalHostName + ":" + httpPort + "/"; 331 regionProfile.httpServerURI = "http://" + externalHostName + ":" + httpPort + "/";
316 regionProfile.UUID = regionID; 332 regionProfile.UUID = regionID;
317 regionProfile.regionName = regionName; 333 regionProfile.regionName = regionName;
334 regionProfile.maturity = access;
318 return regionProfile; 335 return regionProfile;
319 } 336 }
320 } 337 }
diff --git a/OpenSim/Data/RegionProfileServiceProxy.cs b/OpenSim/Data/RegionProfileServiceProxy.cs
index da71936..e9d0036 100644
--- a/OpenSim/Data/RegionProfileServiceProxy.cs
+++ b/OpenSim/Data/RegionProfileServiceProxy.cs
@@ -65,8 +65,9 @@ namespace OpenSim.Data
65 string serverUri = (string)responseData["server_uri"]; 65 string serverUri = (string)responseData["server_uri"];
66 UUID regionID = new UUID((string)responseData["region_UUID"]); 66 UUID regionID = new UUID((string)responseData["region_UUID"]);
67 string regionName = (string)responseData["region_name"]; 67 string regionName = (string)responseData["region_name"];
68 byte access = Convert.ToByte((string)responseData["access"]);
68 69
69 simData = RegionProfileData.Create(regionID, regionName, locX, locY, externalHostName, simPort, httpPort, remotingPort, serverUri); 70 simData = RegionProfileData.Create(regionID, regionName, locX, locY, externalHostName, simPort, httpPort, remotingPort, serverUri, access);
70 } 71 }
71 72
72 return simData; 73 return simData;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 4c107c9..66dee4b 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -334,6 +334,11 @@ namespace OpenSim.Framework
334 get { return m_objectCapacity; } 334 get { return m_objectCapacity; }
335 } 335 }
336 336
337 public byte AccessLevel
338 {
339 get { return (byte)Util.ConvertMaturityToAccessLevel((uint)m_regionSettings.Maturity); }
340 }
341
337 public void SetEndPoint(string ipaddr, int port) 342 public void SetEndPoint(string ipaddr, int port)
338 { 343 {
339 IPAddress tmpIP = IPAddress.Parse(ipaddr); 344 IPAddress tmpIP = IPAddress.Parse(ipaddr);
@@ -691,5 +696,6 @@ namespace OpenSim.Framework
691 regionInfo.ServerURI = serverURI; 696 regionInfo.ServerURI = serverURI;
692 return regionInfo; 697 return regionInfo;
693 } 698 }
699
694 } 700 }
695} 701}
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index cad259d..35efa02 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1045,5 +1045,29 @@ namespace OpenSim.Framework
1045 1045
1046 return guid; 1046 return guid;
1047 } 1047 }
1048
1049 public static byte ConvertMaturityToAccessLevel(uint maturity)
1050 {
1051 byte retVal = 0;
1052 switch (maturity)
1053 {
1054 case 0: //PG
1055 retVal = 13;
1056 break;
1057 case 1: //Mature
1058 retVal = 21;
1059 break;
1060 case 2: // Adult
1061 retVal = 42;
1062 break;
1063 }
1064
1065 return retVal;
1066
1067 }
1068
1069
1070
1071
1048 } 1072 }
1049} 1073}
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
index 87dafa4..14a328f 100644
--- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
@@ -551,6 +551,19 @@ namespace OpenSim.Grid.GridServer.Modules
551 sim.httpServerURI = "http://" + sim.serverIP + ":" + sim.httpPort + "/"; 551 sim.httpServerURI = "http://" + sim.serverIP + ":" + sim.httpPort + "/";
552 552
553 sim.regionName = (string)requestData["sim_name"]; 553 sim.regionName = (string)requestData["sim_name"];
554
555
556 try
557 {
558
559 sim.maturity = Convert.ToUInt32((string)requestData["maturity"]);
560 }
561 catch (KeyNotFoundException)
562 {
563 //older region not providing this key - so default to Mature
564 sim.maturity = 1;
565 }
566
554 return sim; 567 return sim;
555 } 568 }
556 569
@@ -725,7 +738,7 @@ namespace OpenSim.Grid.GridServer.Modules
725 simProfileBlock["y"] = aSim.regionLocY.ToString(); 738 simProfileBlock["y"] = aSim.regionLocY.ToString();
726 //m_log.DebugFormat("[MAP]: Sending neighbour info for {0},{1}", aSim.regionLocX, aSim.regionLocY); 739 //m_log.DebugFormat("[MAP]: Sending neighbour info for {0},{1}", aSim.regionLocX, aSim.regionLocY);
727 simProfileBlock["name"] = aSim.regionName; 740 simProfileBlock["name"] = aSim.regionName;
728 simProfileBlock["access"] = 21; 741 simProfileBlock["access"] = aSim.AccessLevel;
729 simProfileBlock["region-flags"] = 512; 742 simProfileBlock["region-flags"] = 512;
730 simProfileBlock["water-height"] = 0; 743 simProfileBlock["water-height"] = 0;
731 simProfileBlock["agents"] = 1; 744 simProfileBlock["agents"] = 1;
@@ -760,7 +773,7 @@ namespace OpenSim.Grid.GridServer.Modules
760 simProfileBlock["x"] = x; 773 simProfileBlock["x"] = x;
761 simProfileBlock["y"] = y; 774 simProfileBlock["y"] = y;
762 simProfileBlock["name"] = simProfile.regionName; 775 simProfileBlock["name"] = simProfile.regionName;
763 simProfileBlock["access"] = 0; 776 simProfileBlock["access"] = simProfile.AccessLevel;
764 simProfileBlock["region-flags"] = 0; 777 simProfileBlock["region-flags"] = 0;
765 simProfileBlock["water-height"] = 20; 778 simProfileBlock["water-height"] = 20;
766 simProfileBlock["agents"] = 1; 779 simProfileBlock["agents"] = 1;
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;