diff options
author | diva | 2008-12-15 20:45:40 +0000 |
---|---|---|
committer | diva | 2008-12-15 20:45:40 +0000 |
commit | 8fffdac7fa724c651935acb46725bc101cf8dfee (patch) | |
tree | 21f44f4f921d00a0b1b9a65f3e1e53b5f1a396b3 /OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer | |
parent | * minor: method documentation and miscellaneous tidy (diff) | |
download | opensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.zip opensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.tar.gz opensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.tar.bz2 opensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.tar.xz |
Attempt at restoring inventory access after TPs/crossings. RemoveClient in Scene was being too
aggressive at nixing the user out of the cache. We're now relying on NeedSceneCacheClear to decide
whether to nix it or not. All other mods in other files are for better debugging messages.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 0e3634c..20ea030 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -350,11 +350,18 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
350 | // are we even doing here?? | 350 | // are we even doing here?? |
351 | // | 351 | // |
352 | if (s == scene) | 352 | if (s == scene) |
353 | { | ||
354 | //m_log.Debug("[INVTRANSFERMOD]: s == scene. Returning true in " + scene.RegionInfo.RegionName); | ||
353 | return true; | 355 | return true; |
356 | } | ||
354 | else | 357 | else |
358 | { | ||
359 | //m_log.Debug("[INVTRANSFERMOD]: s != scene. Returning false in " + scene.RegionInfo.RegionName); | ||
355 | return false; | 360 | return false; |
361 | } | ||
356 | } | 362 | } |
357 | } | 363 | } |
364 | //m_log.Debug("[INVTRANSFERMOD]: agent not in scene. Returning true in " + scene.RegionInfo.RegionName); | ||
358 | return true; | 365 | return true; |
359 | } | 366 | } |
360 | 367 | ||
@@ -363,12 +370,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
363 | // | 370 | // |
364 | if (m_AgentRegions[agentID] == scene) | 371 | if (m_AgentRegions[agentID] == scene) |
365 | { | 372 | { |
373 | //m_log.Debug("[INVTRANSFERMOD]: m_AgentRegions[agentID] == scene. Returning true in " + scene.RegionInfo.RegionName); | ||
366 | m_AgentRegions.Remove(agentID); | 374 | m_AgentRegions.Remove(agentID); |
367 | return true; | 375 | return true; |
368 | } | 376 | } |
369 | 377 | ||
370 | // Another region has claimed the agent | 378 | // Another region has claimed the agent |
371 | // | 379 | // |
380 | //m_log.Debug("[INVTRANSFERMOD]: last resort. Returning false in " + scene.RegionInfo.RegionName); | ||
372 | return false; | 381 | return false; |
373 | } | 382 | } |
374 | 383 | ||