aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorUbitUmarov2014-09-22 14:44:47 +0100
committerUbitUmarov2014-09-22 14:44:47 +0100
commitb7fca5bcac4e26ec6381e6fc7d085149e8cbc869 (patch)
treeebcb20516a73b8ac068fedfb2f7e9da1321e19f3 /OpenSim/Region/Framework/Scenes
parent send to world or backup, after setting finding information (diff)
downloadopensim-SC_OLD-b7fca5bcac4e26ec6381e6fc7d085149e8cbc869.zip
opensim-SC_OLD-b7fca5bcac4e26ec6381e6fc7d085149e8cbc869.tar.gz
opensim-SC_OLD-b7fca5bcac4e26ec6381e6fc7d085149e8cbc869.tar.bz2
opensim-SC_OLD-b7fca5bcac4e26ec6381e6fc7d085149e8cbc869.tar.xz
same in a few more spots
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index fe785dd..f4ff902 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -296,13 +296,15 @@ namespace OpenSim.Region.Framework.Scenes
296 } 296 }
297 } 297 }
298 298
299 bool ret = AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
300
299 if (attachToBackup && (!alreadyPersisted)) 301 if (attachToBackup && (!alreadyPersisted))
300 { 302 {
301 sceneObject.ForceInventoryPersistence(); 303 sceneObject.ForceInventoryPersistence();
302 sceneObject.HasGroupChanged = true; 304 sceneObject.HasGroupChanged = true;
303 } 305 }
304 306
305 return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates); 307 return ret;
306 } 308 }
307 309
308 /// <summary> 310 /// <summary>
@@ -319,12 +321,17 @@ namespace OpenSim.Region.Framework.Scenes
319 /// </returns> 321 /// </returns>
320 protected internal bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 322 protected internal bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
321 { 323 {
322 // Ensure that we persist this new scene object if it's not an 324
325
326 bool ret = AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
327
328 // Ensure that we persist this new scene object if it's not an
323 // attachment 329 // attachment
330
324 if (attachToBackup) 331 if (attachToBackup)
325 sceneObject.HasGroupChanged = true; 332 sceneObject.HasGroupChanged = true;
326 333
327 return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates); 334 return ret;
328 } 335 }
329 336
330 /// <summary> 337 /// <summary>