diff options
| author | Dan Lake | 2011-12-20 14:46:44 -0800 |
|---|---|---|
| committer | Dan Lake | 2011-12-20 14:46:44 -0800 |
| commit | 7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd (patch) | |
| tree | 3de2f42376d23ead500098d98e6d2bbd6e21feda /OpenSim/Services | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| download | opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.zip opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.gz opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.bz2 opensim-SC-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 7a4ec57..0c55c2e 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
| @@ -486,6 +486,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 486 | return friendsOnline; | 486 | return friendsOnline; |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | [Obsolete] | ||
| 489 | public List<UUID> GetOnlineFriends(UUID userID, List<string> friends) | 490 | public List<UUID> GetOnlineFriends(UUID userID, List<string> friends) |
| 490 | { | 491 | { |
| 491 | Hashtable hash = new Hashtable(); | 492 | Hashtable hash = new Hashtable(); |