diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 6a2b2d9..abd3387 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -196,7 +196,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
196 | /// If true, changes to the object will be reflected in its persisted data | 196 | /// If true, changes to the object will be reflected in its persisted data |
197 | /// If false, the persisted data will not be changed even if the object in the scene is changed | 197 | /// If false, the persisted data will not be changed even if the object in the scene is changed |
198 | /// </param> | 198 | /// </param> |
199 | protected internal void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | 199 | /// <returns> |
200 | /// true if the object was added, false if an object with the same uuid was already in the scene | ||
201 | /// </returns> | ||
202 | protected internal bool AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | ||
200 | { | 203 | { |
201 | sceneObject.RegionHandle = m_regInfo.RegionHandle; | 204 | sceneObject.RegionHandle = m_regInfo.RegionHandle; |
202 | sceneObject.SetScene(m_parentScene); | 205 | sceneObject.SetScene(m_parentScene); |
@@ -208,7 +211,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
208 | 211 | ||
209 | sceneObject.UpdateParentIDs(); | 212 | sceneObject.UpdateParentIDs(); |
210 | 213 | ||
211 | AddSceneObject(sceneObject, attachToBackup); | 214 | return AddSceneObject(sceneObject, attachToBackup); |
212 | } | 215 | } |
213 | 216 | ||
214 | /// <summary> | 217 | /// <summary> |
@@ -220,14 +223,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
220 | /// If true, the object is made persistent into the scene. | 223 | /// If true, the object is made persistent into the scene. |
221 | /// If false, the object will not persist over server restarts | 224 | /// If false, the object will not persist over server restarts |
222 | /// </param> | 225 | /// </param> |
223 | /// <returns>true if the object was added, false if an object with the same uuid was already in the scene | 226 | /// <returns> |
227 | /// true if the object was added, false if an object with the same uuid was already in the scene | ||
224 | /// </returns> | 228 | /// </returns> |
225 | protected internal void AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | 229 | protected internal bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) |
226 | { | 230 | { |
227 | // Ensure that we persist this new scene object | 231 | // Ensure that we persist this new scene object |
228 | sceneObject.HasGroupChanged = true; | 232 | sceneObject.HasGroupChanged = true; |
229 | 233 | ||
230 | AddSceneObject(sceneObject, attachToBackup); | 234 | return AddSceneObject(sceneObject, attachToBackup); |
231 | } | 235 | } |
232 | 236 | ||
233 | /// <summary> | 237 | /// <summary> |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 05026c3..1564556 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1665,9 +1665,9 @@ 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 void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | 1668 | public bool AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) |
1669 | { | 1669 | { |
1670 | m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup); | 1670 | return m_innerScene.AddRestoredSceneObject(sceneObject, attachToBackup); |
1671 | } | 1671 | } |
1672 | 1672 | ||
1673 | /// <summary> | 1673 | /// <summary> |
@@ -1678,9 +1678,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1678 | /// If true, the object is made persistent into the scene. | 1678 | /// If true, the object is made persistent into the scene. |
1679 | /// If false, the object will not persist over server restarts | 1679 | /// If false, the object will not persist over server restarts |
1680 | /// </param> | 1680 | /// </param> |
1681 | public void AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) | 1681 | public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) |
1682 | { | 1682 | { |
1683 | m_innerScene.AddNewSceneObject(sceneObject, attachToBackup); | 1683 | return m_innerScene.AddNewSceneObject(sceneObject, attachToBackup); |
1684 | } | 1684 | } |
1685 | 1685 | ||
1686 | /// <summary> | 1686 | /// <summary> |