diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 4465e8a..a08a628 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -32,7 +32,6 @@ using log4net; | |||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | |||
36 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
@@ -92,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
92 | m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>(); | 91 | m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>(); |
93 | if (m_TransferModule == null) | 92 | if (m_TransferModule == null) |
94 | { | 93 | { |
95 | m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only"); | 94 | m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only"); |
96 | m_Enabled = false; | 95 | m_Enabled = false; |
97 | 96 | ||
98 | m_Scenelist.Clear(); | 97 | m_Scenelist.Clear(); |
@@ -185,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
185 | { | 184 | { |
186 | UUID folderID = new UUID(im.binaryBucket, 1); | 185 | UUID folderID = new UUID(im.binaryBucket, 1); |
187 | 186 | ||
188 | m_log.DebugFormat("[AGENT INVENTORY]: Inserting original folder {0} "+ | 187 | m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+ |
189 | "into agent {1}'s inventory", | 188 | "into agent {1}'s inventory", |
190 | folderID, new UUID(im.toAgentID)); | 189 | folderID, new UUID(im.toAgentID)); |
191 | 190 | ||
@@ -221,7 +220,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
221 | 220 | ||
222 | UUID itemID = new UUID(im.binaryBucket, 1); | 221 | UUID itemID = new UUID(im.binaryBucket, 1); |
223 | 222 | ||
224 | m_log.DebugFormat("[AGENT INVENTORY]: (giving) Inserting item {0} "+ | 223 | m_log.DebugFormat("[INVENTORY TRANSFER]: (giving) Inserting item {0} "+ |
225 | "into agent {1}'s inventory", | 224 | "into agent {1}'s inventory", |
226 | itemID, new UUID(im.toAgentID)); | 225 | itemID, new UUID(im.toAgentID)); |
227 | 226 | ||
@@ -288,10 +287,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
288 | // inventory is loaded. Courtesy of the above bulk update, | 287 | // inventory is loaded. Courtesy of the above bulk update, |
289 | // It will have been pushed to the client, too | 288 | // It will have been pushed to the client, too |
290 | // | 289 | // |
291 | |||
292 | //CachedUserInfo userInfo = | ||
293 | // scene.CommsManager.UserProfileCacheService. | ||
294 | // GetUserDetails(client.AgentId); | ||
295 | IInventoryService invService = scene.InventoryService; | 290 | IInventoryService invService = scene.InventoryService; |
296 | 291 | ||
297 | InventoryFolderBase trashFolder = | 292 | InventoryFolderBase trashFolder = |