From c1d680b6c3a5e3dc11cd1e7cc9b74d3d81317eee Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Tue, 12 May 2009 03:30:37 +0000
Subject: 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.

---
 OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs')

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
             sim.httpServerURI = "http://" + sim.serverIP + ":" + sim.httpPort + "/";
 
             sim.regionName = (string)requestData["sim_name"];
+
+
+            try
+            {
+
+                sim.maturity = Convert.ToUInt32((string)requestData["maturity"]);
+            }
+            catch (KeyNotFoundException)
+            {
+                //older region not providing this key - so default to Mature
+                sim.maturity = 1; 
+            }
+
             return sim;
         }
 
@@ -725,7 +738,7 @@ namespace OpenSim.Grid.GridServer.Modules
                     simProfileBlock["y"] = aSim.regionLocY.ToString();
                     //m_log.DebugFormat("[MAP]: Sending neighbour info for {0},{1}", aSim.regionLocX, aSim.regionLocY);
                     simProfileBlock["name"] = aSim.regionName;
-                    simProfileBlock["access"] = 21;
+                    simProfileBlock["access"] = aSim.AccessLevel;
                     simProfileBlock["region-flags"] = 512;
                     simProfileBlock["water-height"] = 0;
                     simProfileBlock["agents"] = 1;
@@ -760,7 +773,7 @@ namespace OpenSim.Grid.GridServer.Modules
                             simProfileBlock["x"] = x;
                             simProfileBlock["y"] = y;
                             simProfileBlock["name"] = simProfile.regionName;
-                            simProfileBlock["access"] = 0;
+                            simProfileBlock["access"] = simProfile.AccessLevel;
                             simProfileBlock["region-flags"] = 0;
                             simProfileBlock["water-height"] = 20;
                             simProfileBlock["agents"] = 1;
-- 
cgit v1.1