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

fix backup control flag, still a bad merge effect

LSLKeyTest
UbitUmarov 2015-12-11 02:06:32 +00:00
parent 6de7da467a
commit b35d3a3134
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,7 +148,7 @@ namespace OpenSim.Region.Framework.Scenes
if (value) if (value)
{ {
if (m_isBackedUp) if (Backup)
{ {
m_scene.SceneGraph.FireChangeBackup(this); m_scene.SceneGraph.FireChangeBackup(this);
} }
@ -354,13 +354,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public bool Backup { get; private set; } public bool Backup { get; private set; }
private bool m_isBackedUp;
public bool IsBackedUp
{
get { return m_isBackedUp; }
}
protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>(); protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>();
protected ulong m_regionHandle; protected ulong m_regionHandle;
@ -2305,13 +2298,12 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_dupeInProgress = true; m_dupeInProgress = true;
SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
dupe.m_isBackedUp = false;
dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
// a copy isnt backedup // a copy isnt backedup
dupe.Backup = false; dupe.Backup = false;
dupe.m_isBackedUp = false;
// a copy is not in transit hopefully // a copy is not in transit hopefully
dupe.inTransit = false; dupe.inTransit = false;
@ -3305,7 +3297,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (m_scene != null) if (m_scene != null)
m_scene.SceneGraph.FireDetachFromBackup(this); m_scene.SceneGraph.FireDetachFromBackup(this);
if (m_isBackedUp && Scene != null) if (Backup && Scene != null)
m_scene.EventManager.OnBackup -= ProcessBackup; m_scene.EventManager.OnBackup -= ProcessBackup;
Backup = false; Backup = false;