OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix mantis #7054: AO in Firestorm and Kokua stopped loading after new inventory code in place. Cause: # of descendants was wrong.

fsassets
Diva Canto 2015-05-09 08:58:59 -07:00
parent 0bf1209f90
commit adf0f49a69
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs
View File

@ -676,8 +676,8 @@ namespace OpenSim.Capabilities.Handlers
{ {
m_log.WarnFormat("[WEB FETCH INV DESC HANDLER]: Unable to fetch folder {0}", freq.folder_id); m_log.WarnFormat("[WEB FETCH INV DESC HANDLER]: Unable to fetch folder {0}", freq.folder_id);
bad_folders.Add(freq.folder_id); bad_folders.Add(freq.folder_id);
bad = true;
} }
bad = true;
} }
} }
@ -755,6 +755,12 @@ namespace OpenSim.Capabilities.Handlers
} }
} }
//m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Processing folder {0}. Existing items:", freq.folder_id);
//foreach (InventoryItemBase item in itemsToReturn)
// m_log.DebugFormat("[XXX]: {0} {1} {2}", item.Name, item.AssetType, item.Folder);
if (linked != null)
{
foreach (InventoryItemBase linkedItem in linked) foreach (InventoryItemBase linkedItem in linked)
{ {
// Take care of genuinely broken links where the target doesn't exist // Take care of genuinely broken links where the target doesn't exist
@ -764,6 +770,8 @@ namespace OpenSim.Capabilities.Handlers
if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link) if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
{ {
itemsToReturn.Insert(0, linkedItem); itemsToReturn.Insert(0, linkedItem);
//m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Added {0} {1} {2}", linkedItem.Name, linkedItem.AssetType, linkedItem.Folder);
}
} }
} }
} }
@ -824,7 +832,7 @@ namespace OpenSim.Capabilities.Handlers
} }
} }
struct InventoryCollectionWithDescendents class InventoryCollectionWithDescendents
{ {
public InventoryCollection Collection; public InventoryCollection Collection;
public int Descendents; public int Descendents;