diff options
author | Justin Clarke Casey | 2008-05-24 22:45:13 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-24 22:45:13 +0000 |
commit | f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94 (patch) | |
tree | 0ec2ccf815cba335f42b9a64f6a9cc18b0c78230 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Refactor: Renaming various *Entity*() methods to *Object*() methods on the ... (diff) | |
download | opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.zip opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.gz opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.bz2 opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.xz |
* Refactor: Change previous commits Object methods to SceneObject methods instead, on the basis that this is less likely to cause confusion with c#'s base object type
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 5912c51..e3f219f 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 | AddObjectFromStorage(group); | 1166 | AddSceneObjectFromStorage(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 | AddObject(sceneOb); | 1293 | AddSceneObject(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(); |
@@ -1328,25 +1328,25 @@ namespace OpenSim.Region.Environment.Scenes | |||
1328 | /// Add an object into the scene that has come from storage | 1328 | /// Add an object into the scene that has come from storage |
1329 | /// </summary> | 1329 | /// </summary> |
1330 | /// <param name="sceneObject"></param> | 1330 | /// <param name="sceneObject"></param> |
1331 | public void AddObjectFromStorage(SceneObjectGroup sceneObject) | 1331 | public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) |
1332 | { | 1332 | { |
1333 | m_innerScene.AddObjectFromStorage(sceneObject); | 1333 | m_innerScene.AddSceneObjectFromStorage(sceneObject); |
1334 | } | 1334 | } |
1335 | 1335 | ||
1336 | /// <summary> | 1336 | /// <summary> |
1337 | /// Add an object to the scene | 1337 | /// Add an object to the scene |
1338 | /// </summary> | 1338 | /// </summary> |
1339 | /// <param name="sceneObject"></param> | 1339 | /// <param name="sceneObject"></param> |
1340 | public void AddObject(SceneObjectGroup sceneObject) | 1340 | public void AddSceneObject(SceneObjectGroup sceneObject) |
1341 | { | 1341 | { |
1342 | m_innerScene.AddObject(sceneObject); | 1342 | m_innerScene.AddSceneObject(sceneObject); |
1343 | } | 1343 | } |
1344 | 1344 | ||
1345 | /// <summary> | 1345 | /// <summary> |
1346 | /// Remove an object from the scene | 1346 | /// Remove an object from the scene |
1347 | /// </summary> | 1347 | /// </summary> |
1348 | /// <param name="sceneObject"></param> | 1348 | /// <param name="sceneObject"></param> |
1349 | public void RemoveObject(SceneObjectGroup sceneObject) | 1349 | public void RemoveSceneObject(SceneObjectGroup sceneObject) |
1350 | { | 1350 | { |
1351 | if (Entities.ContainsKey(sceneObject.UUID)) | 1351 | if (Entities.ContainsKey(sceneObject.UUID)) |
1352 | { | 1352 | { |
@@ -3164,7 +3164,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3164 | 3164 | ||
3165 | lock (Entities) | 3165 | lock (Entities) |
3166 | { | 3166 | { |
3167 | RemoveObject(group); | 3167 | RemoveSceneObject(group); |
3168 | } | 3168 | } |
3169 | group.DeleteParts(); | 3169 | group.DeleteParts(); |
3170 | 3170 | ||