dont try to backup a object in the middle of possible multipack link
parent
0944a96517
commit
39f73b82d4
|
@ -1913,9 +1913,8 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
if (parentGroup.OwnerID == child.OwnerID)
|
if (parentGroup.OwnerID == child.OwnerID)
|
||||||
{
|
{
|
||||||
parentGroup.LinkToGroup(child);
|
|
||||||
|
|
||||||
child.DetachFromBackup();
|
child.DetachFromBackup();
|
||||||
|
parentGroup.LinkToGroup(child);
|
||||||
|
|
||||||
// this is here so physics gets updated!
|
// this is here so physics gets updated!
|
||||||
// Don't remove! Bad juju! Stay away! or fix physics!
|
// Don't remove! Bad juju! Stay away! or fix physics!
|
||||||
|
@ -1943,7 +1942,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
*/
|
*/
|
||||||
parentGroup.AdjustChildPrimPermissions(false);
|
parentGroup.AdjustChildPrimPermissions(false);
|
||||||
parentGroup.HasGroupChanged = true;
|
parentGroup.HasGroupChanged = true;
|
||||||
parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
|
|
||||||
parentGroup.ScheduleGroupForFullAnimUpdate();
|
parentGroup.ScheduleGroupForFullAnimUpdate();
|
||||||
Monitor.Exit(m_linkLock);
|
Monitor.Exit(m_linkLock);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue