From b35d3a3134163c1347b3bd57d83ca6e47ff9c521 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 11 Dec 2015 02:06:32 +0000
Subject: fix backup control flag, still a bad merge effect

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ee0f674..04db123 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (value)
                 {
                     
-                    if (m_isBackedUp)
+                    if (Backup)
                     {
                         m_scene.SceneGraph.FireChangeBackup(this);
                     }
@@ -354,13 +354,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         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 ulong m_regionHandle;
@@ -2305,13 +2298,12 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_dupeInProgress = true;
             SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
-            dupe.m_isBackedUp = false;
+  
             dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
 
             // a copy isnt backedup
             dupe.Backup = false;
-            dupe.m_isBackedUp = false;
-
+  
             // a copy is not in transit hopefully
             dupe.inTransit = false;
             
@@ -3305,7 +3297,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (m_scene != null)
                 m_scene.SceneGraph.FireDetachFromBackup(this);
-            if (m_isBackedUp && Scene != null)
+            if (Backup && Scene != null)
                 m_scene.EventManager.OnBackup -= ProcessBackup;
             
             Backup = false;
-- 
cgit v1.1