From e4b8912296536aab8a267ddbaee5d95419f806e8 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 17 Oct 2008 17:08:14 +0000 Subject: * reverse part of a change that accidentally crept in with the last revision --- OpenSim/Framework/Communications/UserManagerBase.cs | 4 ++++ OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 32bfed7..ba9cf27 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -84,6 +84,7 @@ namespace OpenSim.Framework.Communications return null; } + public void ResetAttachments(UUID userID) { foreach (IUserDataPlugin plugin in _plugins) @@ -91,6 +92,7 @@ namespace OpenSim.Framework.Communications plugin.ResetAttachments(userID); } } + public UserAgentData GetAgentByUUID(UUID userId) { foreach (IUserDataPlugin plugin in _plugins) @@ -105,6 +107,7 @@ namespace OpenSim.Framework.Communications return null; } + // see IUserService public UserProfileData GetUserProfile(UUID uuid) { @@ -137,6 +140,7 @@ namespace OpenSim.Framework.Communications return new List(); } } + return pickerlist; } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 1f1f88b..20452e0 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// The endpoint of a sender of a particular packet. The port is changed by the various socket receive methods /// - protected EndPoint epSender = new IPEndPoint(IPAddress.Any, 0); + protected EndPoint epSender; protected EndPoint epProxy; protected int proxyPortOffset; @@ -175,6 +175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// protected virtual void OnReceivedData(IAsyncResult result) { + epSender = new IPEndPoint(listenIP, 0); Packet packet = null; int numBytes = 1; -- cgit v1.1