diff options
| author | Melanie | 2011-12-18 10:49:45 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-18 10:49:45 +0000 |
| commit | 759f1d2dbe0617786068195dfd695e0dfc2cc265 (patch) | |
| tree | 8e6dcb6ba183abb16b4527376c5fd280693977bb /OpenSim/Services | |
| parent | Make raycast more efficient by checking exclusion flags earlier (diff) | |
| parent | Provide user feedback on execution of "backup" region console command (diff) | |
| download | opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.zip opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.gz opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.bz2 opensim-SC_OLD-759f1d2dbe0617786068195dfd695e0dfc2cc265.tar.xz | |
Merge branch 'master' into careminster
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 a59b9ee..afbd093 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
| @@ -484,6 +484,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 484 | return friendsOnline; | 484 | return friendsOnline; |
| 485 | } | 485 | } |
| 486 | 486 | ||
| 487 | [Obsolete] | ||
| 487 | public List<UUID> GetOnlineFriends(UUID userID, List<string> friends) | 488 | public List<UUID> GetOnlineFriends(UUID userID, List<string> friends) |
| 488 | { | 489 | { |
| 489 | Hashtable hash = new Hashtable(); | 490 | Hashtable hash = new Hashtable(); |