diff options
| author | BlueWall | 2012-10-20 05:25:58 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-20 05:25:58 -0400 |
| commit | 07f1d44174f5e2b4e3d5ffdec3619bb84f357af2 (patch) | |
| tree | 83cc0442b2c1b89a5b3dd94cff23d5098415777e /OpenSim/Services/HypergridService | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (impl... (diff) | |
| download | opensim-SC_OLD-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.zip opensim-SC_OLD-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.gz opensim-SC_OLD-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.bz2 opensim-SC_OLD-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.xz | |
Merge branch 'master' into connector_plugin
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 a6fc731..a26a922 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
| @@ -504,7 +504,7 @@ namespace OpenSim.Services.HypergridService | |||
| 504 | if (region != null) | 504 | if (region != null) |
| 505 | { | 505 | { |
| 506 | m_log.DebugFormat("[USER AGENT SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline")); | 506 | m_log.DebugFormat("[USER AGENT SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline")); |
| 507 | m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID, online); | 507 | m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID.ToString(), online); |
| 508 | } | 508 | } |
| 509 | } | 509 | } |
| 510 | } | 510 | } |