aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2010-06-08 22:05:49 +0100
committerMelanie2010-06-08 22:05:49 +0100
commit933bfd17f717a0a71845ea2fc56bac444a2cdd65 (patch)
treed9cae9b3c62dfea98087b75f1791c8ab9bb935c2 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentMake the text mode remote console really work. It can now be used to send (diff)
parentImprove instructions for [Groups] setup in OpenSim.ini.example (diff)
downloadopensim-SC_OLD-933bfd17f717a0a71845ea2fc56bac444a2cdd65.zip
opensim-SC_OLD-933bfd17f717a0a71845ea2fc56bac444a2cdd65.tar.gz
opensim-SC_OLD-933bfd17f717a0a71845ea2fc56bac444a2cdd65.tar.bz2
opensim-SC_OLD-933bfd17f717a0a71845ea2fc56bac444a2cdd65.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a02f614..5902080 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -222,11 +222,15 @@ namespace OpenSim.Region.Framework.Scenes
222 /// If true, we won't persist this object until it changes 222 /// If true, we won't persist this object until it changes
223 /// If false, we'll persist this object immediately 223 /// If false, we'll persist this object immediately
224 /// </param> 224 /// </param>
225 /// <param name="sendClientUpdates">
226 /// If true, we send updates to the client to tell it about this object
227 /// If false, we leave it up to the caller to do this
228 /// </param>
225 /// <returns> 229 /// <returns>
226 /// true if the object was added, false if an object with the same uuid was already in the scene 230 /// true if the object was added, false if an object with the same uuid was already in the scene
227 /// </returns> 231 /// </returns>
228 protected internal bool AddRestoredSceneObject( 232 protected internal bool AddRestoredSceneObject(
229 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) 233 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
230 { 234 {
231 if (!alreadyPersisted) 235 if (!alreadyPersisted)
232 { 236 {
@@ -234,9 +238,9 @@ namespace OpenSim.Region.Framework.Scenes
234 sceneObject.HasGroupChanged = true; 238 sceneObject.HasGroupChanged = true;
235 } 239 }
236 240
237 return AddSceneObject(sceneObject, attachToBackup, true); 241 return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
238 } 242 }
239 243
240 /// <summary> 244 /// <summary>
241 /// Add a newly created object to the scene. This will both update the scene, and send information about the 245 /// Add a newly created object to the scene. This will both update the scene, and send information about the
242 /// new object to all clients interested in the scene. 246 /// new object to all clients interested in the scene.