ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 10:46:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fix problem where inventory code throws a swallowed exception on grid mode if the avatar has never logged in before

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-03-31 17:08:58 +00:00
parent 5f04cebb25
commit af3118eccd
2 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@@ -79,25 +79,41 @@ namespace OpenSim.Framework.Communications
// See IInventoryServices
public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
{
//m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
InventoryFolderBase rootFolder = RequestRootFolder(userId);
userFolders.Add(rootFolder);
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
try
{
IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
userFolders.AddRange(folders);
}
m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
InventoryFolderBase rootFolder = RequestRootFolder(userId);
// Agent is completely new and has no inventory structure yet.
if (null == rootFolder)
{
return null;
}
userFolders.Add(rootFolder);
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
{
IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
userFolders.AddRange(folders);
}
// foreach (InventoryFolderBase folder in userFolders)
// {
// m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
// }
return userFolders;
}
catch (Exception e)
{
m_log.ErrorFormat("GetInventorySkeleton() exception {0}", e);
}
// foreach (InventoryFolderBase folder in userFolders)
// {
// m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
// }
return userFolders;
return null;
}
// See IInventoryServices

2
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -1201,7 +1201,7 @@ namespace OpenSim.Region.Environment.Scenes
}
/// <summary>
///
/// Duplicate the given object.
/// </summary>
/// <param name="originalPrim"></param>
/// <param name="offset"></param>