diff options
| author | Melanie | 2013-01-27 01:09:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-27 01:09:07 +0000 |
| commit | e6e6e8ab1541044135d28514d402b64ed06825a0 (patch) | |
| tree | a9051a927857f0ec15187d5faee6bfc222fb0461 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Prevent items being destroyed by rename operations. Renaming of a wearable also (diff) | |
| download | opensim-SC_OLD-e6e6e8ab1541044135d28514d402b64ed06825a0.zip opensim-SC_OLD-e6e6e8ab1541044135d28514d402b64ed06825a0.tar.gz opensim-SC_OLD-e6e6e8ab1541044135d28514d402b64ed06825a0.tar.bz2 opensim-SC_OLD-e6e6e8ab1541044135d28514d402b64ed06825a0.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9cdcd96..0bed66e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -5109,7 +5109,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5109 | { | 5109 | { |
| 5110 | if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0) | 5110 | if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0) |
| 5111 | { | 5111 | { |
| 5112 | if (grp.RootPart.Expires <= DateTime.Now) | 5112 | if (grp.GetSittingAvatarsCount() == 0 && grp.RootPart.Expires <= DateTime.Now) |
| 5113 | DeleteSceneObject(grp, false); | 5113 | DeleteSceneObject(grp, false); |
| 5114 | } | 5114 | } |
| 5115 | } | 5115 | } |