diff options
| author | Melanie | 2012-10-20 02:33:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-20 02:33:24 +0100 |
| commit | 6ad8d3c43f130dfb80a7543e139ffa4dacb840ad (patch) | |
| tree | 24baeecab6becf3bb30c26046ea95b75e6bbdc0f /OpenSim/Services/HypergridService | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Rename assetCache constructor param in UUIDGatherer to assetService wh... (diff) | |
| download | opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.zip opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.gz opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.bz2 opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/HypergridService')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGFriendsService.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs index 98423d7..a8bcfb2 100644 --- a/OpenSim/Services/HypergridService/HGFriendsService.cs +++ b/OpenSim/Services/HypergridService/HGFriendsService.cs | |||
| @@ -397,7 +397,7 @@ namespace OpenSim.Services.HypergridService | |||
| 397 | if (region != null) | 397 | if (region != null) |
| 398 | { | 398 | { |
| 399 | m_log.DebugFormat("[HGFRIENDS SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline")); | 399 | m_log.DebugFormat("[HGFRIENDS SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline")); |
| 400 | m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID, online); | 400 | m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID.ToString(), online); |
| 401 | } | 401 | } |
| 402 | } | 402 | } |
| 403 | } | 403 | } |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 56aafe6..416ad16 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
| @@ -502,7 +502,7 @@ namespace OpenSim.Services.HypergridService | |||
| 502 | if (region != null) | 502 | if (region != null) |
| 503 | { | 503 | { |
| 504 | m_log.DebugFormat("[USER AGENT SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline")); | 504 | m_log.DebugFormat("[USER AGENT SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline")); |
| 505 | m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID, online); | 505 | m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID.ToString(), online); |
| 506 | } | 506 | } |
| 507 | } | 507 | } |
| 508 | } | 508 | } |