aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs28
1 files changed, 20 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7c198bf..5912c51 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1163,7 +1163,7 @@ namespace OpenSim.Region.Environment.Scenes
1163 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); 1163 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID);
1164 foreach (SceneObjectGroup group in PrimsFromDB) 1164 foreach (SceneObjectGroup group in PrimsFromDB)
1165 { 1165 {
1166 AddEntityFromStorage(group); 1166 AddObjectFromStorage(group);
1167 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 1167 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
1168 rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; 1168 rootPart.ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted;
1169 rootPart.TrimPermissions(); 1169 rootPart.TrimPermissions();
@@ -1290,7 +1290,7 @@ namespace OpenSim.Region.Environment.Scenes
1290 { 1290 {
1291 SceneObjectGroup sceneOb = 1291 SceneObjectGroup sceneOb =
1292 new SceneObjectGroup(this, m_regionHandle, ownerID, PrimIDAllocate(), pos, rot, shape); 1292 new SceneObjectGroup(this, m_regionHandle, ownerID, PrimIDAllocate(), pos, rot, shape);
1293 AddEntity(sceneOb); 1293 AddObject(sceneOb);
1294 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); 1294 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
1295 // if grass or tree, make phantom 1295 // if grass or tree, make phantom
1296 //rootPart.TrimPermissions(); 1296 //rootPart.TrimPermissions();
@@ -1324,17 +1324,29 @@ namespace OpenSim.Region.Environment.Scenes
1324 m_innerScene.RemovePrim(localID, avatar_deleter); 1324 m_innerScene.RemovePrim(localID, avatar_deleter);
1325 } 1325 }
1326 1326
1327 public void AddEntityFromStorage(SceneObjectGroup sceneObject) 1327 /// <summary>
1328 /// Add an object into the scene that has come from storage
1329 /// </summary>
1330 /// <param name="sceneObject"></param>
1331 public void AddObjectFromStorage(SceneObjectGroup sceneObject)
1328 { 1332 {
1329 m_innerScene.AddEntityFromStorage(sceneObject); 1333 m_innerScene.AddObjectFromStorage(sceneObject);
1330 } 1334 }
1331 1335
1332 public void AddEntity(SceneObjectGroup sceneObject) 1336 /// <summary>
1337 /// Add an object to the scene
1338 /// </summary>
1339 /// <param name="sceneObject"></param>
1340 public void AddObject(SceneObjectGroup sceneObject)
1333 { 1341 {
1334 m_innerScene.AddEntity(sceneObject); 1342 m_innerScene.AddObject(sceneObject);
1335 } 1343 }
1336 1344
1337 public void RemoveEntity(SceneObjectGroup sceneObject) 1345 /// <summary>
1346 /// Remove an object from the scene
1347 /// </summary>
1348 /// <param name="sceneObject"></param>
1349 public void RemoveObject(SceneObjectGroup sceneObject)
1338 { 1350 {
1339 if (Entities.ContainsKey(sceneObject.UUID)) 1351 if (Entities.ContainsKey(sceneObject.UUID))
1340 { 1352 {
@@ -3152,7 +3164,7 @@ namespace OpenSim.Region.Environment.Scenes
3152 3164
3153 lock (Entities) 3165 lock (Entities)
3154 { 3166 {
3155 RemoveEntity(group); 3167 RemoveObject(group);
3156 } 3168 }
3157 group.DeleteParts(); 3169 group.DeleteParts();
3158 3170