aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-12 17:49:08 +0000
committerJustin Clarke Casey2008-06-12 17:49:08 +0000
commit8714833986cef44787fd57a61699b7bdcfd3d3bb (patch)
treefbd78ff5755484df5ca5732389a7006f92db6508 /OpenSim/Region/Environment/Scenes/Scene.cs
parent* refactor: rename CreatePrimFromXml to CreatePrimFromXml2 (diff)
downloadopensim-SC_OLD-8714833986cef44787fd57a61699b7bdcfd3d3bb.zip
opensim-SC_OLD-8714833986cef44787fd57a61699b7bdcfd3d3bb.tar.gz
opensim-SC_OLD-8714833986cef44787fd57a61699b7bdcfd3d3bb.tar.bz2
opensim-SC_OLD-8714833986cef44787fd57a61699b7bdcfd3d3bb.tar.xz
* refactor: For new objects, move attach to backup to occur when adding to a scene, rather than on creation of the group
* Adding to a scene is now parameterized such that one can choose not to actually persist that group * This is to support a use case where a module wants a scene which consists of both objects which are persisted, and ones which are just temporary for the lifetime of that server instance
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 526c125..43bb709 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1492,7 +1492,7 @@ namespace OpenSim.Region.Environment.Scenes
1492 { 1492 {
1493 SceneObjectGroup sceneOb = 1493 SceneObjectGroup sceneOb =
1494 new SceneObjectGroup(this, m_regionHandle, ownerID, PrimIDAllocate(), pos, rot, shape); 1494 new SceneObjectGroup(this, m_regionHandle, ownerID, PrimIDAllocate(), pos, rot, shape);
1495 AddSceneObject(sceneOb); 1495 AddSceneObject(sceneOb, true);
1496 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); 1496 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
1497 // if grass or tree, make phantom 1497 // if grass or tree, make phantom
1498 //rootPart.TrimPermissions(); 1498 //rootPart.TrimPermissions();
@@ -1556,9 +1556,13 @@ namespace OpenSim.Region.Environment.Scenes
1556 /// Add an object to the scene 1556 /// Add an object to the scene
1557 /// </summary> 1557 /// </summary>
1558 /// <param name="sceneObject"></param> 1558 /// <param name="sceneObject"></param>
1559 public void AddSceneObject(SceneObjectGroup sceneObject) 1559 /// <param name="attachToBackup">
1560 /// If true, the object is made persistent into the scene.
1561 /// If false, the object will not persist over server restarts
1562 /// </param>
1563 public void AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
1560 { 1564 {
1561 m_innerScene.AddSceneObject(sceneObject); 1565 m_innerScene.AddSceneObject(sceneObject, attachToBackup);
1562 } 1566 }
1563 1567
1564 /// <summary> 1568 /// <summary>