aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs16
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs17
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs7
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs1
7 files changed, 28 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index a3c40e0..420e3ca 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -198,4 +198,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
198 OnInstantMessage(null, msg); 198 OnInstantMessage(null, msg);
199 } 199 }
200 } 200 }
201} 201} \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index d025f0c..730cc77 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -132,20 +132,21 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
132 { 132 {
133 UUID toAgentID = new UUID(im.toAgentID); 133 UUID toAgentID = new UUID(im.toAgentID);
134 134
135 m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString());
136
137 // Try root avatar only first 135 // Try root avatar only first
138 foreach (Scene scene in m_Scenes) 136 foreach (Scene scene in m_Scenes)
139 { 137 {
140 if (scene.Entities.ContainsKey(toAgentID) && 138 if (scene.Entities.ContainsKey(toAgentID) &&
141 scene.Entities[toAgentID] is ScenePresence) 139 scene.Entities[toAgentID] is ScenePresence)
142 { 140 {
143 m_log.DebugFormat("[INSTANT MESSAGE]: Looking for {0} in {1}", toAgentID.ToString(), scene.RegionInfo.RegionName); 141// m_log.DebugFormat(
144 // Local message 142// "[INSTANT MESSAGE]: Looking for root agent {0} in {1}",
143// toAgentID.ToString(), scene.RegionInfo.RegionName);
144
145 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 145 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
146 if (!user.IsChildAgent) 146 if (!user.IsChildAgent)
147 { 147 {
148 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); 148 // Local message
149 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
149 user.ControllingClient.SendInstantMessage(im); 150 user.ControllingClient.SendInstantMessage(im);
150 151
151 // Message sent 152 // Message sent
@@ -167,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
167 // Local message 168 // Local message
168 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 169 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
169 170
170 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); 171 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
171 user.ControllingClient.SendInstantMessage(im); 172 user.ControllingClient.SendInstantMessage(im);
172 173
173 // Message sent 174 // Message sent
@@ -176,6 +177,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
176 } 177 }
177 } 178 }
178 179
180 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
179 SendGridInstantMessageViaXMLRPC(im, result); 181 SendGridInstantMessageViaXMLRPC(im, result);
180 182
181 return; 183 return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 8b77a5f..4117e86 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;
@@ -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();
@@ -160,8 +159,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
160 159
161 private void OnInstantMessage(IClientAPI client, GridInstantMessage im) 160 private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
162 { 161 {
163 m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog); 162 m_log.InfoFormat(
164 163 "[INVENTORY TRANSFER]: {0} IM type received from {1}",
164 (InstantMessageDialog)im.dialog, client.Name);
165
165 Scene scene = FindClientScene(client.AgentId); 166 Scene scene = FindClientScene(client.AgentId);
166 167
167 if (scene == null) // Something seriously wrong here. 168 if (scene == null) // Something seriously wrong here.
@@ -185,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
185 { 186 {
186 UUID folderID = new UUID(im.binaryBucket, 1); 187 UUID folderID = new UUID(im.binaryBucket, 1);
187 188
188 m_log.DebugFormat("[AGENT INVENTORY]: Inserting original folder {0} "+ 189 m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+
189 "into agent {1}'s inventory", 190 "into agent {1}'s inventory",
190 folderID, new UUID(im.toAgentID)); 191 folderID, new UUID(im.toAgentID));
191 192
@@ -221,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
221 222
222 UUID itemID = new UUID(im.binaryBucket, 1); 223 UUID itemID = new UUID(im.binaryBucket, 1);
223 224
224 m_log.DebugFormat("[AGENT INVENTORY]: (giving) Inserting item {0} "+ 225 m_log.DebugFormat("[INVENTORY TRANSFER]: (giving) Inserting item {0} "+
225 "into agent {1}'s inventory", 226 "into agent {1}'s inventory",
226 itemID, new UUID(im.toAgentID)); 227 itemID, new UUID(im.toAgentID));
227 228
@@ -286,10 +287,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
286 // inventory is loaded. Courtesy of the above bulk update, 287 // inventory is loaded. Courtesy of the above bulk update,
287 // It will have been pushed to the client, too 288 // It will have been pushed to the client, too
288 // 289 //
289
290 //CachedUserInfo userInfo =
291 // scene.CommsManager.UserProfileCacheService.
292 // GetUserDetails(client.AgentId);
293 IInventoryService invService = scene.InventoryService; 290 IInventoryService invService = scene.InventoryService;
294 291
295 InventoryFolderBase trashFolder = 292 InventoryFolderBase trashFolder =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
index 1e51187..dcf08e3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
@@ -27,15 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30
31using OpenMetaverse; 30using OpenMetaverse;
32using Nini.Config; 31using Nini.Config;
33using log4net; 32using log4net;
34
35using OpenSim.Framework; 33using OpenSim.Framework;
36using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
37 35
38
39namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory 36namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
40{ 37{
41 public abstract class BaseInventoryConnector : IInventoryService 38 public abstract class BaseInventoryConnector : IInventoryService
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index c97ab9e..4e2f602 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -161,6 +161,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
161 /// <returns></returns> 161 /// <returns></returns>
162 public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) 162 public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
163 { 163 {
164 m_log.DebugFormat("[INVENTORY CACHE]: Getting folder for asset type {0} for user {1}", type, userID);
165
164 Dictionary<AssetType, InventoryFolderBase> folders = null; 166 Dictionary<AssetType, InventoryFolderBase> folders = null;
165 167
166 lock (m_InventoryCache) 168 lock (m_InventoryCache)
@@ -177,8 +179,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
177 179
178 if ((folders != null) && folders.ContainsKey(type)) 180 if ((folders != null) && folders.ContainsKey(type))
179 { 181 {
182 m_log.DebugFormat(
183 "[INVENTORY CACHE]: Returning folder {0} as type {1} for {2}", folders[type], type, userID);
184
180 return folders[type]; 185 return folders[type];
181 } 186 }
187
188 m_log.WarnFormat("[INVENTORY CACHE]: Could not find folder for system type {0} for {1}", type, userID);
182 189
183 return null; 190 return null;
184 } 191 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 22bd04c..3de6e5c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -223,6 +223,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
223 /// <returns>true if the item was successfully added</returns> 223 /// <returns>true if the item was successfully added</returns>
224 public bool AddItem(InventoryItemBase item) 224 public bool AddItem(InventoryItemBase item)
225 { 225 {
226 m_log.DebugFormat(
227 "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}",
228 item.Name, item.Owner, item.Folder);
229
226 return m_InventoryService.AddItem(item); 230 return m_InventoryService.AddItem(item);
227 } 231 }
228 232
@@ -236,7 +240,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
236 return m_InventoryService.UpdateItem(item); 240 return m_InventoryService.UpdateItem(item);
237 } 241 }
238 242
239
240 public bool MoveItems(UUID ownerID, List<InventoryItemBase> items) 243 public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
241 { 244 {
242 return m_InventoryService.MoveItems(ownerID, items); 245 return m_InventoryService.MoveItems(ownerID, items);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 153aeec..17d80c7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
75 base.Init(source); 75 base.Init(source);
76 } 76 }
77 77
78
79 #region ISharedRegionModule 78 #region ISharedRegionModule
80 79
81 public void Initialise(IConfigSource source) 80 public void Initialise(IConfigSource source)