aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2014-03-22 01:49:28 +0000
committerMelanie2014-03-22 01:49:28 +0000
commitebe7726cd764a6d1275daae5c9bb6e81c9cc8e8e (patch)
tree265a6cbf0bf452b9e4be4d120be1eeb009b58e14 /OpenSim
parentAllow the setting from the environment to take effect if no explicit setting ... (diff)
parentRename SOG.InSceneBackup to CanBeBackedUp to reflect its actual functionality. (diff)
downloadopensim-SC-ebe7726cd764a6d1275daae5c9bb6e81c9cc8e8e.zip
opensim-SC-ebe7726cd764a6d1275daae5c9bb6e81c9cc8e8e.tar.gz
opensim-SC-ebe7726cd764a6d1275daae5c9bb6e81c9cc8e8e.tar.bz2
opensim-SC-ebe7726cd764a6d1275daae5c9bb6e81c9cc8e8e.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 567c6ea..6f26176 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -699,7 +699,11 @@ namespace OpenSim.Region.Framework.Scenes
699 set { m_rootPart.Text = value; } 699 set { m_rootPart.Text = value; }
700 } 700 }
701 701
702 protected virtual bool InSceneBackup 702 /// <summary>
703 /// If set to true then the scene object can be backed up in principle, though this will only actually occur
704 /// if Backup is set. If false then the scene object will never be backed up, Backup will always be false.
705 /// </summary>
706 protected virtual bool CanBeBackedUp
703 { 707 {
704 get { return true; } 708 get { return true; }
705 } 709 }
@@ -880,7 +884,7 @@ namespace OpenSim.Region.Framework.Scenes
880 /// </summary> 884 /// </summary>
881 public virtual void AttachToBackup() 885 public virtual void AttachToBackup()
882 { 886 {
883 if (InSceneBackup) 887 if (CanBeBackedUp)
884 { 888 {
885 //m_log.DebugFormat( 889 //m_log.DebugFormat(
886 // "[SCENE OBJECT GROUP]: Attaching object {0} {1} to scene presistence sweep", Name, UUID); 890 // "[SCENE OBJECT GROUP]: Attaching object {0} {1} to scene presistence sweep", Name, UUID);