diff options
| author | Jonathan Freedman | 2010-10-18 23:00:48 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-18 23:00:48 -0400 |
| commit | 12128f1917d9f6288e268ccce9304c2b8c825d92 (patch) | |
| tree | a1825bf495e15aadb86ce0ce457007717933988c /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| parent | Add 'contributors' notice for zlib.net.dll to keep track of its origin and ve... (diff) | |
| download | opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.zip opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.gz opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.bz2 opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index d1274e9..e3d4969 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
| @@ -159,9 +159,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
| 159 | 159 | ||
| 160 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) | 160 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
| 161 | { | 161 | { |
| 162 | m_log.DebugFormat( | 162 | // m_log.DebugFormat( |
| 163 | "[INVENTORY TRANSFER]: {0} IM type received from {1}", | 163 | // "[INVENTORY TRANSFER]: {0} IM type received from {1}", |
| 164 | (InstantMessageDialog)im.dialog, client.Name); | 164 | // (InstantMessageDialog)im.dialog, client.Name); |
| 165 | 165 | ||
| 166 | Scene scene = FindClientScene(client.AgentId); | 166 | Scene scene = FindClientScene(client.AgentId); |
| 167 | 167 | ||