diff options
| author | dr scofield (aka dirk husemann) | 2009-10-02 11:10:52 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-02 11:31:30 +0200 |
| commit | 2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7 (patch) | |
| tree | 74913862b829b7e56994f2c33ca5fe35638baad1 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.zip opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.gz opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.bz2 opensim-SC-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.xz | |
- cleaning up LandData/ILandObject capitalization issues
- adding LandDataSerializer to OAR mechanics
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 25489d8..6a10618 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1320,15 +1320,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1320 | ILandObject parcel = m_scene.LandChannel.GetLandObject( | 1320 | ILandObject parcel = m_scene.LandChannel.GetLandObject( |
| 1321 | m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); | 1321 | m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); |
| 1322 | 1322 | ||
| 1323 | if (parcel != null && parcel.landData != null && | 1323 | if (parcel != null && parcel.LandData != null && |
| 1324 | parcel.landData.OtherCleanTime != 0) | 1324 | parcel.LandData.OtherCleanTime != 0) |
| 1325 | { | 1325 | { |
| 1326 | if (parcel.landData.OwnerID != OwnerID && | 1326 | if (parcel.LandData.OwnerID != OwnerID && |
| 1327 | (parcel.landData.GroupID != GroupID || | 1327 | (parcel.LandData.GroupID != GroupID || |
| 1328 | parcel.landData.GroupID == UUID.Zero)) | 1328 | parcel.LandData.GroupID == UUID.Zero)) |
| 1329 | { | 1329 | { |
| 1330 | if ((DateTime.Now - RootPart.Rezzed).TotalMinutes > | 1330 | if ((DateTime.Now - RootPart.Rezzed).TotalMinutes > |
| 1331 | parcel.landData.OtherCleanTime) | 1331 | parcel.LandData.OtherCleanTime) |
| 1332 | { | 1332 | { |
| 1333 | DetachFromBackup(); | 1333 | DetachFromBackup(); |
| 1334 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); | 1334 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); |