aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-27 14:15:14 +0000
committerJustin Clarke Casey2008-06-27 14:15:14 +0000
commitc9b41bdc4ea33452e675a1d12244aab196fcde29 (patch)
treeb10ff60ec398de243c54579d827f2e3a51495736 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parentstatus: work in progress, non-functional (diff)
downloadopensim-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/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 87c4226..c7068fa 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -192,7 +192,11 @@ namespace OpenSim.Region.Environment.Scenes
192 /// Add an object into the scene that has come from storage 192 /// Add an object into the scene that has come from storage
193 /// </summary> 193 /// </summary>
194 /// <param name="sceneObject"></param> 194 /// <param name="sceneObject"></param>
195 protected internal void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) 195 /// <param name="attachToBackup">
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
198 /// </param>
199 protected internal void AddRestoredSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
196 { 200 {
197 sceneObject.RegionHandle = m_regInfo.RegionHandle; 201 sceneObject.RegionHandle = m_regInfo.RegionHandle;
198 sceneObject.SetScene(m_parentScene); 202 sceneObject.SetScene(m_parentScene);
@@ -204,7 +208,7 @@ namespace OpenSim.Region.Environment.Scenes
204 208
205 sceneObject.UpdateParentIDs(); 209 sceneObject.UpdateParentIDs();
206 210
207 AddSceneObject(sceneObject, true); 211 AddSceneObject(sceneObject, attachToBackup);
208 } 212 }
209 213
210 /// <summary> 214 /// <summary>