aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-10 14:05:49 -0800
committerJohn Hurliman2010-03-10 14:05:49 -0800
commit2af97b46ecc96a58028e53045efffd75c07ec857 (patch)
treea377e7ecfaf744bb3e662f4381fa7b8d7df2d7d7
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-2af97b46ecc96a58028e53045efffd75c07ec857.zip
opensim-SC_OLD-2af97b46ecc96a58028e53045efffd75c07ec857.tar.gz
opensim-SC_OLD-2af97b46ecc96a58028e53045efffd75c07ec857.tar.bz2
opensim-SC_OLD-2af97b46ecc96a58028e53045efffd75c07ec857.tar.xz
* Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debug line, and commented the debug line out since it can quickly become noisy
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index dad0efd..7277527 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1102,18 +1102,18 @@ namespace OpenSim.Region.Framework.Scenes
1102 if (folder == null) 1102 if (folder == null)
1103 return; 1103 return;
1104 1104
1105 m_log.DebugFormat("[AGENT INVENTORY]: Send Inventory Folder {0} Update to {1} {2}", folder.Name, client.FirstName, client.LastName); 1105 // Fetch the folder contents
1106 InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); 1106 InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID);
1107 InventoryFolderBase containingFolder = new InventoryFolderBase(); 1107
1108 containingFolder.ID = folder.ID; 1108 // Fetch the folder itself to get its current version
1109 containingFolder.Owner = client.AgentId; 1109 InventoryFolderBase containingFolder = new InventoryFolderBase(folder.ID, client.AgentId);
1110 containingFolder = InventoryService.GetFolder(containingFolder); 1110 containingFolder = InventoryService.GetFolder(containingFolder);
1111 if (containingFolder != null)
1112 {
1113 int version = containingFolder.Version;
1114 1111
1115 client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, version, fetchFolders, fetchItems); 1112 //m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}",
1116 } 1113 // contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName);
1114
1115 if (containingFolder != null)
1116 client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems);
1117 } 1117 }
1118 1118
1119 /// <summary> 1119 /// <summary>