diff options
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
-rw-r--r-- | OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/SnapshotStore.cs | 21 |
2 files changed, 9 insertions, 14 deletions
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index 6e69902..00f6918 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
73 | client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos, | 73 | client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos, |
74 | IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) { this.Stale = true; }; | 74 | IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) { this.Stale = true; }; |
75 | client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, | 75 | client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, |
76 | Quaternion rot, bool silent) { this.Stale = true; }; | 76 | bool silent) { this.Stale = true; }; |
77 | client.OnObjectDuplicate += delegate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID, | 77 | client.OnObjectDuplicate += delegate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID, |
78 | UUID GroupID) { this.Stale = true; }; | 78 | UUID GroupID) { this.Stale = true; }; |
79 | client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID, | 79 | client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID, |
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs index 976c2c1..70cb205 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: | 261 | if (scene.RegionInfo.RegionSettings.Maturity == 0) |
262 | // "PG" - Mormontown | 262 | return "PG"; |
263 | // "Mature" - Sodom and Gomorrah | 263 | |
264 | if (scene.RegionInfo.RegionSettings.Maturity == 1) | 264 | if (scene.RegionInfo.RegionSettings.Maturity == 1) |
265 | { | ||
266 | return "Mature"; | 265 | return "Mature"; |
267 | } | 266 | |
268 | else if (scene.RegionInfo.RegionSettings.Maturity == 0) | 267 | if (scene.RegionInfo.RegionSettings.Maturity == 2) |
269 | { | 268 | return "Adult"; |
270 | return "PG"; | 269 | |
271 | } | 270 | return "Unknown"; |
272 | else | ||
273 | { | ||
274 | return "Unknown"; | ||
275 | } | ||
276 | } | 271 | } |
277 | 272 | ||
278 | private XmlNode GetGridSnapshotData(XmlDocument factory) | 273 | private XmlNode GetGridSnapshotData(XmlDocument factory) |