diff options
| author | Melanie | 2009-10-07 03:01:11 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-07 03:01:11 +0100 |
| commit | 6f2d183107161dc6736c20dcbbd14849bc31335b (patch) | |
| tree | 9ce909d93126824c9ce09fece4d1d960fd3092a5 /OpenSim/Region/Framework | |
| parent | Revert "Merging in diva's locking fixes" (diff) | |
| parent | * One more debug message on FetchInventoryDescendants (diff) | |
| download | opensim-SC-6f2d183107161dc6736c20dcbbd14849bc31335b.zip opensim-SC-6f2d183107161dc6736c20dcbbd14849bc31335b.tar.gz opensim-SC-6f2d183107161dc6736c20dcbbd14849bc31335b.tar.bz2 opensim-SC-6f2d183107161dc6736c20dcbbd14849bc31335b.tar.xz | |
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a4460e4..1917228 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1168,6 +1168,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1168 | 1168 | ||
| 1169 | private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) | 1169 | private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) |
| 1170 | { | 1170 | { |
| 1171 | m_log.DebugFormat("[AGENT INVENTORY]: Send Inventory Folder {0} Update to {1} {2}", folder.Name, client.FirstName, client.LastName); | ||
| 1171 | InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); | 1172 | InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); |
| 1172 | client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, fetchFolders, fetchItems); | 1173 | client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, fetchFolders, fetchItems); |
| 1173 | } | 1174 | } |