aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKevin Cozens2010-07-06 17:36:47 -0400
committerDiva Canto2010-07-07 02:42:32 -0700
commit68f0ab9504a96eefa55fe68c8bd4d94cf812685f (patch)
treeb5cb4bc0b3e3b66c03f8378216e3ab3e5ff4bffe
parentFixes mantis #4845 (diff)
downloadopensim-SC-68f0ab9504a96eefa55fe68c8bd4d94cf812685f.zip
opensim-SC-68f0ab9504a96eefa55fe68c8bd4d94cf812685f.tar.gz
opensim-SC-68f0ab9504a96eefa55fe68c8bd4d94cf812685f.tar.bz2
opensim-SC-68f0ab9504a96eefa55fe68c8bd4d94cf812685f.tar.xz
Fixes problem where "Adult" regions were reported as being of type "Unknown".
-rw-r--r--OpenSim/Region/DataSnapshot/SnapshotStore.cs19
1 files changed, 7 insertions, 12 deletions
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 976c2c1..f356b43 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -258,21 +258,16 @@ namespace OpenSim.Region.DataSnapshot
258 258
259 private String GetRegionCategory(Scene scene) 259 private String GetRegionCategory(Scene scene)
260 { 260 {
261 //Boolean choice between:
262 // "PG" - Mormontown
263 // "Mature" - Sodom and Gomorrah
264 if (scene.RegionInfo.RegionSettings.Maturity == 1) 261 if (scene.RegionInfo.RegionSettings.Maturity == 1)
265 {
266 return "Mature"; 262 return "Mature";
267 } 263
268 else if (scene.RegionInfo.RegionSettings.Maturity == 0) 264 if (scene.RegionInfo.RegionSettings.Maturity == 2)
269 { 265 return "Adult";
266
267 if (scene.RegionInfo.RegionSettings.Maturity == 0)
270 return "PG"; 268 return "PG";
271 } 269
272 else 270 return "Unknown";
273 {
274 return "Unknown";
275 }
276 } 271 }
277 272
278 private XmlNode GetGridSnapshotData(XmlDocument factory) 273 private XmlNode GetGridSnapshotData(XmlDocument factory)