diff options
| author | Justin Clark-Casey (justincc) | 2012-03-21 23:59:59 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-22 00:00:05 +0000 |
| commit | 71ec84d77f440c9801462e1bda95a67f3386a19b (patch) | |
| tree | 5819185495a439ca2c5f7455bd377b32332e1254 /OpenSim/Services/HypergridService/UserAgentService.cs | |
| parent | Instead of loading default avatar animations in both SLUtil and AvatarAnimati... (diff) | |
| parent | Updated the UserAccountsClient a little bit, plus some more sanity checks on ... (diff) | |
| download | opensim-SC-71ec84d77f440c9801462e1bda95a67f3386a19b.zip opensim-SC-71ec84d77f440c9801462e1bda95a67f3386a19b.tar.gz opensim-SC-71ec84d77f440c9801462e1bda95a67f3386a19b.tar.bz2 opensim-SC-71ec84d77f440c9801462e1bda95a67f3386a19b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
| -rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 5eca801..6a5007f 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
| @@ -334,6 +334,7 @@ namespace OpenSim.Services.HypergridService | |||
| 334 | return false; | 334 | return false; |
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | [Obsolete] | ||
| 337 | public List<UUID> StatusNotification(List<string> friends, UUID foreignUserID, bool online) | 338 | public List<UUID> StatusNotification(List<string> friends, UUID foreignUserID, bool online) |
| 338 | { | 339 | { |
| 339 | if (m_FriendsService == null || m_PresenceService == null) | 340 | if (m_FriendsService == null || m_PresenceService == null) |
| @@ -414,6 +415,7 @@ namespace OpenSim.Services.HypergridService | |||
| 414 | return new List<UUID>(); | 415 | return new List<UUID>(); |
| 415 | } | 416 | } |
| 416 | 417 | ||
| 418 | [Obsolete] | ||
| 417 | protected void ForwardStatusNotificationToSim(UUID regionID, UUID foreignUserID, string user, bool online) | 419 | protected void ForwardStatusNotificationToSim(UUID regionID, UUID foreignUserID, string user, bool online) |
| 418 | { | 420 | { |
| 419 | UUID userID; | 421 | UUID userID; |