diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Framework/Communications/Cache | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 8ee1b1a..ca641d0 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
| @@ -747,7 +747,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 747 | 747 | ||
| 748 | InventoryItemBase itemInfo = null; | 748 | InventoryItemBase itemInfo = null; |
| 749 | 749 | ||
| 750 | itemInfo = m_InventoryService.QueryItem(item); | 750 | itemInfo = m_InventoryService.GetItem(item); |
| 751 | 751 | ||
| 752 | if (itemInfo != null) | 752 | if (itemInfo != null) |
| 753 | { | 753 | { |
| @@ -784,7 +784,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 784 | 784 | ||
| 785 | InventoryFolderBase folderInfo = null; | 785 | InventoryFolderBase folderInfo = null; |
| 786 | 786 | ||
| 787 | folderInfo = m_InventoryService.QueryFolder(folder); | 787 | folderInfo = m_InventoryService.GetFolder(folder); |
| 788 | 788 | ||
| 789 | if (folderInfo != null) | 789 | if (folderInfo != null) |
| 790 | { | 790 | { |