diff options
| author | Diva Canto | 2011-05-26 15:52:34 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-26 15:52:34 -0700 |
| commit | b17afe43c4f72bace2bd991d4cac83837acb9a67 (patch) | |
| tree | e23aae27316b018065890b77028dfa4706981d5e /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | HG IM in grid mode working fairly well. Unknown target user references looked... (diff) | |
| parent | improve help information for "appearance show" (diff) | |
| download | opensim-SC-b17afe43c4f72bace2bd991d4cac83837acb9a67.zip opensim-SC-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.gz opensim-SC-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.bz2 opensim-SC-b17afe43c4f72bace2bd991d4cac83837acb9a67.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 19a9506..9b9374b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1335 | } | 1335 | } |
| 1336 | } | 1336 | } |
| 1337 | 1337 | ||
| 1338 | if (HasGroupChanged) | 1338 | if (m_scene.UseBackup && HasGroupChanged) |
| 1339 | { | 1339 | { |
| 1340 | // don't backup while it's selected or you're asking for changes mid stream. | 1340 | // don't backup while it's selected or you're asking for changes mid stream. |
| 1341 | if (isTimeToPersist() || forcedBackup) | 1341 | if (isTimeToPersist() || forcedBackup) |