Merge branch 'master' into careminster

2026-08-05 08:55:56 +08:00 · 2011-12-18 10:49:45 +00:00
parent c4f1906b0a 4d065f0453
commit 759f1d2dbe
25 changed files with 303 additions and 294 deletions
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -259,6 +259,7 @@ namespace OpenSim.Server.Handlers.Hypergrid

        }

+        [Obsolete]
        public XmlRpcResponse GetOnlineFriends(XmlRpcRequest request, IPEndPoint remoteClient)
        {
            Hashtable hash = new Hashtable();