aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs17
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 2f1e9dd..eeb8c50 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;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35
36using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
38using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
@@ -91,7 +90,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
91 m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>(); 90 m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
92 if (m_TransferModule == null) 91 if (m_TransferModule == null)
93 { 92 {
94 m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only"); 93 m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only");
95 m_Enabled = false; 94 m_Enabled = false;
96 95
97 m_Scenelist.Clear(); 96 m_Scenelist.Clear();
@@ -153,8 +152,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
153 152
154 private void OnInstantMessage(IClientAPI client, GridInstantMessage im) 153 private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
155 { 154 {
156 m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog); 155 m_log.InfoFormat(
157 156 "[INVENTORY TRANSFER]: {0} IM type received from {1}",
157 (InstantMessageDialog)im.dialog, client.Name);
158
158 Scene scene = FindClientScene(client.AgentId); 159 Scene scene = FindClientScene(client.AgentId);
159 160
160 if (scene == null) // Something seriously wrong here. 161 if (scene == null) // Something seriously wrong here.
@@ -179,7 +180,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
179 { 180 {
180 UUID folderID = new UUID(im.binaryBucket, 1); 181 UUID folderID = new UUID(im.binaryBucket, 1);
181 182
182 m_log.DebugFormat("[AGENT INVENTORY]: Inserting original folder {0} "+ 183 m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+
183 "into agent {1}'s inventory", 184 "into agent {1}'s inventory",
184 folderID, new UUID(im.toAgentID)); 185 folderID, new UUID(im.toAgentID));
185 186
@@ -215,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
215 216
216 UUID itemID = new UUID(im.binaryBucket, 1); 217 UUID itemID = new UUID(im.binaryBucket, 1);
217 218
218 m_log.DebugFormat("[AGENT INVENTORY]: (giving) Inserting item {0} "+ 219 m_log.DebugFormat("[INVENTORY TRANSFER]: (giving) Inserting item {0} "+
219 "into agent {1}'s inventory", 220 "into agent {1}'s inventory",
220 itemID, new UUID(im.toAgentID)); 221 itemID, new UUID(im.toAgentID));
221 222
@@ -280,10 +281,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
280 // inventory is loaded. Courtesy of the above bulk update, 281 // inventory is loaded. Courtesy of the above bulk update,
281 // It will have been pushed to the client, too 282 // It will have been pushed to the client, too
282 // 283 //
283
284 //CachedUserInfo userInfo =
285 // scene.CommsManager.UserProfileCacheService.
286 // GetUserDetails(client.AgentId);
287 IInventoryService invService = scene.InventoryService; 284 IInventoryService invService = scene.InventoryService;
288 285
289 InventoryFolderBase trashFolder = 286 InventoryFolderBase trashFolder =