diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
3 files changed, 17 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index ab141eb..e9ea281 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -197,4 +197,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
197 | OnInstantMessage(null, msg); | 197 | OnInstantMessage(null, msg); |
198 | } | 198 | } |
199 | } | 199 | } |
200 | } | 200 | } \ 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 83209fc..dd8dac3 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 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; | |||
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; |
@@ -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 = |