diff options
author | Justin Clarke Casey | 2008-07-13 00:18:29 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-13 00:18:29 +0000 |
commit | eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c (patch) | |
tree | e744381547466429d3001955b62dd4f2e28c7983 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Elminate most of the debugging log output from the archive commands (diff) | |
download | opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.zip opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.tar.gz opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.tar.bz2 opensim-SC_OLD-eb63b9bbc10ee9d794c273dc01111de8ce8c8a0c.tar.xz |
* Actually persist restored archives to the database - wasn't actually doing this before (doh)
* Not quite perfect yet
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1564556..fb931f4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1485,7 +1485,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1485 | List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); | 1485 | List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); |
1486 | foreach (SceneObjectGroup group in PrimsFromDB) | 1486 | foreach (SceneObjectGroup group in PrimsFromDB) |
1487 | { | 1487 | { |
1488 | AddRestoredSceneObject(group, true); | 1488 | AddRestoredSceneObject(group, true, true); |
1489 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1489 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
1490 | rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; | 1490 | rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; |
1491 | rootPart.TrimPermissions(); | 1491 | rootPart.TrimPermissions(); |
@@ -1665,9 +1665,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
1665 | /// Add an object into the scene that has come from storage | 1665 | /// Add an object into the scene that has come from storage |
1666 | /// </summary> | 1666 | /// </summary> |
1667 | /// <param name="sceneObject"></param> | 1667 | /// <param name="sceneObject"></param> |
1668 | public bool AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | 1668 | /// <param name="attachToBackup"> |
1669 | /// If true, changes to the object will be reflected in its persisted data | ||
1670 | /// If false, the persisted data will not be changed even if the object in the scene is changed | ||
1671 | /// </param> | ||
1672 | /// <param name="alreadyPersisted"> | ||
1673 | /// If true, we won't persist this object until it changes | ||
1674 | /// If false, we'll persist this object immediately | ||
1675 | /// </param> | ||
1676 | /// <returns> | ||
1677 | /// true if the object was added, false if an object with the same uuid was already in the scene | ||
1678 | /// </returns> | ||
1679 | public bool AddRestoredSceneObject( | ||
1680 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) | ||
1669 | { | 1681 | { |
1670 | return m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup); | 1682 | return m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted); |
1671 | } | 1683 | } |
1672 | 1684 | ||
1673 | /// <summary> | 1685 | /// <summary> |