OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reinstate cleaning objects from parcel when avatars sit on them. Instead do it 

properly for temp-on-rez. Auto-return overrides sitting. Temp does not.
avinationmerge
Melanie 2013-01-26 20:39:17 +01:00
parent 1b5d5d7040
commit f1fbb774b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -5122,7 +5122,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0) if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
{ {
if (grp.RootPart.Expires <= DateTime.Now) if (grp.GetSittingAvatarsCount() == 0 && grp.RootPart.Expires <= DateTime.Now)
DeleteSceneObject(grp, false); DeleteSceneObject(grp, false);
} }
} }

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2023,7 +2023,7 @@ namespace OpenSim.Region.Framework.Scenes
(parcel.LandData.GroupID != GroupID || (parcel.LandData.GroupID != GroupID ||
parcel.LandData.GroupID == UUID.Zero)) parcel.LandData.GroupID == UUID.Zero))
{ {
if (GetSittingAvatarsCount() == 0 && (DateTime.UtcNow - RootPart.Rezzed).TotalMinutes > if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
parcel.LandData.OtherCleanTime) parcel.LandData.OtherCleanTime)
{ {
DetachFromBackup(); DetachFromBackup();