diff options
| author | Jonathan Freedman | 2010-10-31 20:50:39 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-31 20:50:39 -0400 |
| commit | 12d61d1ef51584e34352ba913825f218dbfb595f (patch) | |
| tree | 545c628571da79dac0689847340bf413f4529fbe /OpenSim | |
| parent | * better semantics for link-region command (diff) | |
| parent | Removed a couple of very verbose debug messages. (diff) | |
| download | opensim-SC_OLD-12d61d1ef51584e34352ba913825f218dbfb595f.zip opensim-SC_OLD-12d61d1ef51584e34352ba913825f218dbfb595f.tar.gz opensim-SC_OLD-12d61d1ef51584e34352ba913825f218dbfb595f.tar.bz2 opensim-SC_OLD-12d61d1ef51584e34352ba913825f218dbfb595f.tar.xz | |
Merge branch 'master' into mantis5110
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 34205e3..bd01bb9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
| @@ -261,7 +261,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
| 261 | 261 | ||
| 262 | public InventoryItemBase GetItem(InventoryItemBase item) | 262 | public InventoryItemBase GetItem(InventoryItemBase item) |
| 263 | { | 263 | { |
| 264 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); | 264 | //m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); |
| 265 | if (item == null) | 265 | if (item == null) |
| 266 | return null; | 266 | return null; |
| 267 | 267 | ||
| @@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
| 272 | 272 | ||
| 273 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 273 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
| 274 | { | 274 | { |
| 275 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); | 275 | //m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); |
| 276 | if (folder == null) | 276 | if (folder == null) |
| 277 | return null; | 277 | return null; |
| 278 | 278 | ||