ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix the conditions to do parcel objects autoreturn

Browse Source
This commit is contained in:
UbitUmarov
2016-08-24 04:37:21 +01:00
parent c05ee23d3d
commit 8f509af1f4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2244,10 +2244,10 @@ namespace OpenSim.Region.Framework.Scenes
// any exception propogate upwards.
try
{
if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
!m_scene.LoginsEnabled || // We're starting up or doing maintenance, don't mess with things
m_scene.LoadingPrims) // Land may not be valid yet
// if shutting down then there will be nothing to handle the return so leave till next restart
if (!m_scene.ShuttingDown &&
m_scene.LoginsEnabled && // We're starting up or doing maintenance, don't mess with things
!m_scene.LoadingPrims) // Land may not be valid yet
{
ILandObject parcel = m_scene.LandChannel.GetLandObject(
m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
@@ -3402,10 +3402,11 @@ namespace OpenSim.Region.Framework.Scenes
public virtual void DetachFromBackup()
{
if (m_scene != null)
{
m_scene.SceneGraph.FireDetachFromBackup(this);
if (Backup && Scene != null)
m_scene.EventManager.OnBackup -= ProcessBackup;
if (Backup)
m_scene.EventManager.OnBackup -= ProcessBackup;
}
Backup = false;
}