aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs16
1 files changed, 4 insertions, 12 deletions
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
148 if (value) 148 if (value)
149 { 149 {
150 150
151 if (m_isBackedUp) 151 if (Backup)
152 { 152 {
153 m_scene.SceneGraph.FireChangeBackup(this); 153 m_scene.SceneGraph.FireChangeBackup(this);
154 } 154 }
@@ -354,13 +354,6 @@ namespace OpenSim.Region.Framework.Scenes
354 /// </summary> 354 /// </summary>
355 public bool Backup { get; private set; } 355 public bool Backup { get; private set; }
356 356
357 private bool m_isBackedUp;
358
359 public bool IsBackedUp
360 {
361 get { return m_isBackedUp; }
362 }
363
364 protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>(); 357 protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>();
365 358
366 protected ulong m_regionHandle; 359 protected ulong m_regionHandle;
@@ -2305,13 +2298,12 @@ namespace OpenSim.Region.Framework.Scenes
2305 { 2298 {
2306 m_dupeInProgress = true; 2299 m_dupeInProgress = true;
2307 SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); 2300 SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
2308 dupe.m_isBackedUp = false; 2301
2309 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); 2302 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
2310 2303
2311 // a copy isnt backedup 2304 // a copy isnt backedup
2312 dupe.Backup = false; 2305 dupe.Backup = false;
2313 dupe.m_isBackedUp = false; 2306
2314
2315 // a copy is not in transit hopefully 2307 // a copy is not in transit hopefully
2316 dupe.inTransit = false; 2308 dupe.inTransit = false;
2317 2309
@@ -3305,7 +3297,7 @@ namespace OpenSim.Region.Framework.Scenes
3305 { 3297 {
3306 if (m_scene != null) 3298 if (m_scene != null)
3307 m_scene.SceneGraph.FireDetachFromBackup(this); 3299 m_scene.SceneGraph.FireDetachFromBackup(this);
3308 if (m_isBackedUp && Scene != null) 3300 if (Backup && Scene != null)
3309 m_scene.EventManager.OnBackup -= ProcessBackup; 3301 m_scene.EventManager.OnBackup -= ProcessBackup;
3310 3302
3311 Backup = false; 3303 Backup = false;