diff options
author | Justin Clarke Casey | 2008-06-27 14:15:14 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-27 14:15:14 +0000 |
commit | c9b41bdc4ea33452e675a1d12244aab196fcde29 (patch) | |
tree | b10ff60ec398de243c54579d827f2e3a51495736 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | status: work in progress, non-functional (diff) | |
download | opensim-SC_OLD-c9b41bdc4ea33452e675a1d12244aab196fcde29.zip opensim-SC_OLD-c9b41bdc4ea33452e675a1d12244aab196fcde29.tar.gz opensim-SC_OLD-c9b41bdc4ea33452e675a1d12244aab196fcde29.tar.bz2 opensim-SC_OLD-c9b41bdc4ea33452e675a1d12244aab196fcde29.tar.xz |
* Add extra backup parameter to InnerScene.AddRestoredSceneObject()
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index c7de419..ecb54e6 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1470,7 +1470,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1470 | List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); | 1470 | List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); |
1471 | foreach (SceneObjectGroup group in PrimsFromDB) | 1471 | foreach (SceneObjectGroup group in PrimsFromDB) |
1472 | { | 1472 | { |
1473 | AddSceneObjectFromStorage(group); | 1473 | AddRestoredSceneObject(group, true); |
1474 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1474 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
1475 | rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; | 1475 | rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; |
1476 | rootPart.TrimPermissions(); | 1476 | rootPart.TrimPermissions(); |
@@ -1651,9 +1651,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1651 | /// Add an object into the scene that has come from storage | 1651 | /// Add an object into the scene that has come from storage |
1652 | /// </summary> | 1652 | /// </summary> |
1653 | /// <param name="sceneObject"></param> | 1653 | /// <param name="sceneObject"></param> |
1654 | public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) | 1654 | public void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) |
1655 | { | 1655 | { |
1656 | m_innerScene.AddSceneObjectFromStorage(sceneObject); | 1656 | m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup); |
1657 | } | 1657 | } |
1658 | 1658 | ||
1659 | /// <summary> | 1659 | /// <summary> |