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/Data/RegionProfileData.cs | |
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 '')
-rw-r--r-- | OpenSim/Data/RegionProfileData.cs | 21 |
1 files changed, 19 insertions, 2 deletions
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 | } |