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/Server/Handlers | |
| 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/Server/Handlers')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index 50010f2..07c6962 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
| @@ -259,6 +259,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 259 | 259 | ||
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | [Obsolete] | ||
| 262 | public XmlRpcResponse GetOnlineFriends(XmlRpcRequest request, IPEndPoint remoteClient) | 263 | public XmlRpcResponse GetOnlineFriends(XmlRpcRequest request, IPEndPoint remoteClient) |
| 263 | { | 264 | { |
| 264 | Hashtable hash = new Hashtable(); | 265 | Hashtable hash = new Hashtable(); |