diff options
| author | Melanie | 2013-01-26 18:03:18 +0100 |
|---|---|---|
| committer | Melanie | 2013-01-26 18:03:18 +0100 |
| commit | 1b5d5d70401ef69bf3e9da0bb1e668d4ccd520ce (patch) | |
| tree | c2a60b6655266a5f2e849e76a28d46046b39c63a /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'teravuswork' into avination (diff) | |
| download | opensim-SC-1b5d5d70401ef69bf3e9da0bb1e668d4ccd520ce.zip opensim-SC-1b5d5d70401ef69bf3e9da0bb1e668d4ccd520ce.tar.gz opensim-SC-1b5d5d70401ef69bf3e9da0bb1e668d4ccd520ce.tar.bz2 opensim-SC-1b5d5d70401ef69bf3e9da0bb1e668d4ccd520ce.tar.xz | |
Stop temp-on-rez object from being deleted while an avatar sits on them
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ed1bbd8..41f04e2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -2023,7 +2023,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2023 | (parcel.LandData.GroupID != GroupID || | 2023 | (parcel.LandData.GroupID != GroupID || |
| 2024 | parcel.LandData.GroupID == UUID.Zero)) | 2024 | parcel.LandData.GroupID == UUID.Zero)) |
| 2025 | { | 2025 | { |
| 2026 | if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes > | 2026 | if (GetSittingAvatarsCount() == 0 && (DateTime.UtcNow - RootPart.Rezzed).TotalMinutes > |
| 2027 | parcel.LandData.OtherCleanTime) | 2027 | parcel.LandData.OtherCleanTime) |
| 2028 | { | 2028 | { |
| 2029 | DetachFromBackup(); | 2029 | DetachFromBackup(); |