diff options
author | Justin Clark-Casey (justincc) | 2010-04-30 22:22:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-30 22:22:40 +0100 |
commit | f1164161b3344eeb3d178a8747870ed73046e818 (patch) | |
tree | 6b8a58c112941fc6c5ee6dd72bccfd5e16e79447 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |
parent | minor: eliminate more debug Console.WriteLines, convert one to logging instead (diff) | |
parent | Fix linking issue introduced in my earlier commit (diff) | |
download | opensim-SC_OLD-f1164161b3344eeb3d178a8747870ed73046e818.zip opensim-SC_OLD-f1164161b3344eeb3d178a8747870ed73046e818.tar.gz opensim-SC_OLD-f1164161b3344eeb3d178a8747870ed73046e818.tar.bz2 opensim-SC_OLD-f1164161b3344eeb3d178a8747870ed73046e818.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index ac9e792..277060d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -172,11 +172,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
172 | return m_RemoteConnector.GetFolderForType(userID, type); | 172 | return m_RemoteConnector.GetFolderForType(userID, type); |
173 | } | 173 | } |
174 | 174 | ||
175 | public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) | ||
176 | { | ||
177 | return m_RemoteConnector.GetSystemFolders(userID); | ||
178 | } | ||
179 | |||
180 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 175 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
181 | { | 176 | { |
182 | return m_RemoteConnector.GetFolderContent(userID, folderID); | 177 | return m_RemoteConnector.GetFolderContent(userID, folderID); |
@@ -267,9 +262,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
267 | 262 | ||
268 | public InventoryItemBase GetItem(InventoryItemBase item) | 263 | public InventoryItemBase GetItem(InventoryItemBase item) |
269 | { | 264 | { |
265 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); | ||
270 | if (item == null) | 266 | if (item == null) |
271 | return null; | 267 | return null; |
272 | 268 | ||
269 | if (m_RemoteConnector == null) | ||
270 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: connector stub is null!!!"); | ||
273 | return m_RemoteConnector.GetItem(item); | 271 | return m_RemoteConnector.GetItem(item); |
274 | } | 272 | } |
275 | 273 | ||