diff options
author | Melanie | 2009-11-24 16:00:45 +0000 |
---|---|---|
committer | Melanie | 2009-11-24 16:00:45 +0000 |
commit | 81f7e9b462ae1596f1625087a14ba37cca59865b (patch) | |
tree | a7b3ddba3948d2b2e98e3271c8db87379137dffe /OpenSim/Region/CoreModules/Avatar | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Removed some extra debug chatter (diff) | |
download | opensim-SC-81f7e9b462ae1596f1625087a14ba37cca59865b.zip opensim-SC-81f7e9b462ae1596f1625087a14ba37cca59865b.tar.gz opensim-SC-81f7e9b462ae1596f1625087a14ba37cca59865b.tar.bz2 opensim-SC-81f7e9b462ae1596f1625087a14ba37cca59865b.tar.xz |
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 42 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 2 |
2 files changed, 24 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index cd59bdb..5c24f03 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -266,25 +266,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
266 | } | 266 | } |
267 | 267 | ||
268 | // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); | 268 | // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); |
269 | 269 | if (c.Scene != null) | |
270 | ((Scene)c.Scene).ForEachScenePresence( | 270 | { |
271 | delegate(ScenePresence presence) | 271 | ((Scene)c.Scene).ForEachScenePresence |
272 | { | 272 | ( |
273 | // ignore chat from child agents | 273 | delegate(ScenePresence presence) |
274 | if (presence.IsChildAgent) return; | 274 | { |
275 | 275 | // ignore chat from child agents | |
276 | IClientAPI client = presence.ControllingClient; | 276 | if (presence.IsChildAgent) return; |
277 | 277 | ||
278 | // don't forward SayOwner chat from objects to | 278 | IClientAPI client = presence.ControllingClient; |
279 | // non-owner agents | 279 | |
280 | if ((c.Type == ChatTypeEnum.Owner) && | 280 | // don't forward SayOwner chat from objects to |
281 | (null != c.SenderObject) && | 281 | // non-owner agents |
282 | (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) | 282 | if ((c.Type == ChatTypeEnum.Owner) && |
283 | return; | 283 | (null != c.SenderObject) && |
284 | 284 | (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) | |
285 | client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, | 285 | return; |
286 | (byte)sourceType, (byte)ChatAudibleLevel.Fully); | 286 | |
287 | }); | 287 | client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, |
288 | (byte)sourceType, (byte)ChatAudibleLevel.Fully); | ||
289 | } | ||
290 | ); | ||
291 | } | ||
288 | } | 292 | } |
289 | 293 | ||
290 | 294 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index d9a021f..b60b32b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -389,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
389 | { | 389 | { |
390 | // Check if this is ours to handle | 390 | // Check if this is ours to handle |
391 | // | 391 | // |
392 | m_log.Info("OnFridInstantMessage"); | 392 | //m_log.Info("OnFridInstantMessage"); |
393 | if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered) | 393 | if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered) |
394 | return; | 394 | return; |
395 | 395 | ||