aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-21 21:16:42 +0000
committerJustin Clarke Casey2008-11-21 21:16:42 +0000
commit915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe (patch)
tree1f62bf777f73c4f3fffb2f5237cd7e5eaeddcb6f /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parent* Extend sog delete to inventory test to crank the normally async sog deleter... (diff)
downloadopensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.zip
opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.gz
opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.bz2
opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.xz
* refactor: Rip out SOP inventory from the partial into a separate class
* SceneObjectPartInventory.cs isn't a particularly good name but it's probably not got a long life * A proper inventory interface to follow * Parallel changes for other inventory partial classes to follow at a later date
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index f9eaa89..fcda37b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1044,7 +1044,7 @@ namespace OpenSim.Region.Environment.Scenes
1044 { 1044 {
1045 foreach (SceneObjectPart part in m_parts.Values) 1045 foreach (SceneObjectPart part in m_parts.Values)
1046 { 1046 {
1047// part.RemoveScriptInstances(); 1047// part.Inventory.RemoveScriptInstances();
1048 1048
1049 List<ScenePresence> avatars = Scene.GetScenePresences(); 1049 List<ScenePresence> avatars = Scene.GetScenePresences();
1050 for (int i = 0; i < avatars.Count; i++) 1050 for (int i = 0; i < avatars.Count; i++)
@@ -1251,7 +1251,7 @@ namespace OpenSim.Region.Environment.Scenes
1251 1251
1252 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); 1252 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
1253 1253
1254 backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); 1254 backup_group.ForEachPart(delegate(SceneObjectPart part) { part.Inventory.ProcessInventoryBackup(datastore); });
1255 1255
1256 backup_group = null; 1256 backup_group = null;
1257 } 1257 }
@@ -2828,7 +2828,7 @@ namespace OpenSim.Region.Environment.Scenes
2828 foreach (SceneObjectPart part in m_parts.Values) 2828 foreach (SceneObjectPart part in m_parts.Values)
2829 { 2829 {
2830 part.SetGroup(GroupID, client); 2830 part.SetGroup(GroupID, client);
2831 part.ChangeInventoryGroup(GroupID); 2831 part.Inventory.ChangeInventoryGroup(GroupID);
2832 } 2832 }
2833 2833
2834 HasGroupChanged = true; 2834 HasGroupChanged = true;