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/Grid | |
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 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs | 17 |
1 files changed, 15 insertions, 2 deletions
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; |