aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/UserAgentService.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-03-23 03:41:48 +0000
committerUbitUmarov2012-03-23 03:41:48 +0000
commit4db05a98c2c1678b612e0a3d2f95c24e34ac5f13 (patch)
tree3929bd993c504a3de7697f449e36535aeeddf737 /OpenSim/Services/HypergridService/UserAgentService.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.zip
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.gz
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.bz2
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 65963d9..842ca58 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -332,6 +332,7 @@ namespace OpenSim.Services.HypergridService
332 return false; 332 return false;
333 } 333 }
334 334
335 [Obsolete]
335 public List<UUID> StatusNotification(List<string> friends, UUID foreignUserID, bool online) 336 public List<UUID> StatusNotification(List<string> friends, UUID foreignUserID, bool online)
336 { 337 {
337 if (m_FriendsService == null || m_PresenceService == null) 338 if (m_FriendsService == null || m_PresenceService == null)
@@ -412,6 +413,7 @@ namespace OpenSim.Services.HypergridService
412 return new List<UUID>(); 413 return new List<UUID>();
413 } 414 }
414 415
416 [Obsolete]
415 protected void ForwardStatusNotificationToSim(UUID regionID, UUID foreignUserID, string user, bool online) 417 protected void ForwardStatusNotificationToSim(UUID regionID, UUID foreignUserID, string user, bool online)
416 { 418 {
417 UUID userID; 419 UUID userID;