diff options
author | Diva Canto | 2010-01-07 15:53:55 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-07 15:53:55 -0800 |
commit | f11a97f12d328af8bb39b92fec5cb5780983b66a (patch) | |
tree | 00f96f853b91e105786b416dd18f2c76e56fd1fd /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Merge branch 'master' into presence-refactor (diff) | |
download | opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.zip opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.gz opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.bz2 opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.xz |
* Finished SimulationServiceConnector
* Started rerouting calls to UserService.
* Compiles. May run.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a14c853..1c5c247 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1163,15 +1163,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
1163 | 1163 | ||
1164 | private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) | 1164 | private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) |
1165 | { | 1165 | { |
1166 | if (folder == null) | ||
1167 | return; | ||
1168 | |||
1166 | m_log.DebugFormat("[AGENT INVENTORY]: Send Inventory Folder {0} Update to {1} {2}", folder.Name, client.FirstName, client.LastName); | 1169 | m_log.DebugFormat("[AGENT INVENTORY]: Send Inventory Folder {0} Update to {1} {2}", folder.Name, client.FirstName, client.LastName); |
1167 | InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); | 1170 | InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); |
1168 | InventoryFolderBase containingFolder = new InventoryFolderBase(); | 1171 | InventoryFolderBase containingFolder = new InventoryFolderBase(); |
1169 | containingFolder.ID = folder.ID; | 1172 | containingFolder.ID = folder.ID; |
1170 | containingFolder.Owner = client.AgentId; | 1173 | containingFolder.Owner = client.AgentId; |
1171 | containingFolder = InventoryService.GetFolder(containingFolder); | 1174 | containingFolder = InventoryService.GetFolder(containingFolder); |
1172 | int version = containingFolder.Version; | 1175 | if (containingFolder != null) |
1176 | { | ||
1177 | int version = containingFolder.Version; | ||
1173 | 1178 | ||
1174 | client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, version, fetchFolders, fetchItems); | 1179 | client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, version, fetchFolders, fetchItems); |
1180 | } | ||
1175 | } | 1181 | } |
1176 | 1182 | ||
1177 | /// <summary> | 1183 | /// <summary> |