diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 16a2b9b..ea69abb 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -523,15 +523,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
523 | foreach (PresenceInfo friendSession in friendSessions) | 523 | foreach (PresenceInfo friendSession in friendSessions) |
524 | { | 524 | { |
525 | // let's guard against sessions-gone-bad | 525 | // let's guard against sessions-gone-bad |
526 | if (friendSession.RegionID != UUID.Zero) | 526 | if (friendSession != null && friendSession.RegionID != UUID.Zero) |
527 | { | 527 | { |
528 | m_log.DebugFormat("[FRIENDS]: Get region {0}", friendSession.RegionID); | ||
528 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); | 529 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); |
529 | m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", (region == null ? "null" : region.RegionName)); | ||
530 | if (region != null) | 530 | if (region != null) |
531 | { | 531 | { |
532 | m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online); | 532 | m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online); |
533 | } | 533 | } |
534 | } | 534 | } |
535 | else | ||
536 | m_log.DebugFormat("[FRIENDS]: friend session is null or the region is UUID.Zero"); | ||
535 | } | 537 | } |
536 | } | 538 | } |
537 | 539 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 64d5f61..1eae0ac 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -244,7 +244,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
244 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 244 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
245 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) | 245 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) |
246 | { | 246 | { |
247 | m_log.DebugFormat("[HGScene] RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID); | 247 | m_log.DebugFormat("[HGScene]: RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID); |
248 | 248 | ||
249 | //if (fromTaskID.Equals(UUID.Zero)) | 249 | //if (fromTaskID.Equals(UUID.Zero)) |
250 | //{ | 250 | //{ |