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

Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in SQlite. Fixes most grief in 

http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
arthursv
Diva Canto 2009-08-19 16:15:04 -07:00
parent 51e487a172
commit 6e35ddb0e9
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

@ -628,12 +628,12 @@ namespace OpenSim.Data.SQLite
public InventoryItemBase queryInventoryItem(UUID itemID) public InventoryItemBase queryInventoryItem(UUID itemID)
{ {
return null; return getInventoryItem(itemID);
} }
public InventoryFolderBase queryInventoryFolder(UUID folderID) public InventoryFolderBase queryInventoryFolder(UUID folderID)
{ {
return null; return getInventoryFolder(folderID);
} }
/// <summary> /// <summary>

6
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
{ {
InventoryFolderBase root = GetRootFolder(userID); InventoryFolderBase root = m_InventoryService.GetRootFolder(userID);
if (root != null) if (root != null)
{ {
InventoryCollection content = GetFolderContent(userID, root.ID); InventoryCollection content = GetFolderContent(userID, root.ID);
@ -202,13 +202,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{ {
if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown)) if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
{ {
m_log.InfoFormat("[INVENTORY CONNECTOR]: folder type {0} ", folder.Type); //m_log.InfoFormat("[INVENTORY CONNECTOR]: folder type {0} ", folder.Type);
folders[(AssetType)folder.Type] = folder; folders[(AssetType)folder.Type] = folder;
} }
} }
// Put the root folder there, as type Folder // Put the root folder there, as type Folder
folders[AssetType.Folder] = root; folders[AssetType.Folder] = root;
m_log.InfoFormat("[INVENTORY CONNECTOR]: root folder is type {0} ", root.Type); //m_log.InfoFormat("[INVENTORY CONNECTOR]: root folder is type {0} ", root.Type);
return folders; return folders;
} }

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -179,8 +179,8 @@ namespace OpenSim.Region.Framework.Scenes
else else
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update", "[AGENT INVENTORY]: Could not find item {0} for caps inventory update",
remoteClient.AgentId); itemID);
} }
return UUID.Zero; return UUID.Zero;

6
OpenSim/Services/InventoryService/InventoryService.cs
View File

@ -420,16 +420,16 @@ namespace OpenSim.Services.InventoryService
public virtual InventoryItemBase GetItem(InventoryItemBase item) public virtual InventoryItemBase GetItem(InventoryItemBase item)
{ {
InventoryItemBase result = m_Database.queryInventoryItem(item.ID); InventoryItemBase result = m_Database.getInventoryItem(item.ID);
if (result != null) if (result != null)
return result; return result;
m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
return null; return null;
} }
public virtual InventoryFolderBase GetFolder(InventoryFolderBase item) public virtual InventoryFolderBase GetFolder(InventoryFolderBase item)
{ {
InventoryFolderBase result = m_Database.queryInventoryFolder(item.ID); InventoryFolderBase result = m_Database.getInventoryFolder(item.ID);
if (result != null) if (result != null)
return result; return result;