* reverse part of a change that accidentally crept in with the last revision

0.6.0-stable
Justin Clarke Casey 2008-10-17 17:08:14 +00:00
parent 138bcf6fff
commit e4b8912296
2 changed files with 6 additions and 1 deletions

View File

@ -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<AvatarPickerAvatar>();
}
}
return pickerlist;
}

View File

@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <value>
/// The endpoint of a sender of a particular packet. The port is changed by the various socket receive methods
/// </value>
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
/// <param name="result"></param>
protected virtual void OnReceivedData(IAsyncResult result)
{
epSender = new IPEndPoint(listenIP, 0);
Packet packet = null;
int numBytes = 1;