OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -84,6 +84,7 @@ namespace OpenSim.Framework.Communications
return null; return null;
} }
public void ResetAttachments(UUID userID) public void ResetAttachments(UUID userID)
{ {
foreach (IUserDataPlugin plugin in _plugins) foreach (IUserDataPlugin plugin in _plugins)
@ -91,6 +92,7 @@ namespace OpenSim.Framework.Communications
plugin.ResetAttachments(userID); plugin.ResetAttachments(userID);
} }
} }
public UserAgentData GetAgentByUUID(UUID userId) public UserAgentData GetAgentByUUID(UUID userId)
{ {
foreach (IUserDataPlugin plugin in _plugins) foreach (IUserDataPlugin plugin in _plugins)
@ -105,6 +107,7 @@ namespace OpenSim.Framework.Communications
return null; return null;
} }
// see IUserService // see IUserService
public UserProfileData GetUserProfile(UUID uuid) public UserProfileData GetUserProfile(UUID uuid)
{ {
@ -137,6 +140,7 @@ namespace OpenSim.Framework.Communications
return new List<AvatarPickerAvatar>(); return new List<AvatarPickerAvatar>();
} }
} }
return pickerlist; return pickerlist;
} }

3
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

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