Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint.
parent
ffbca99b57
commit
1912215c40
|
@ -1354,7 +1354,6 @@ namespace OpenSim.Framework
|
||||||
void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
|
void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
|
||||||
|
|
||||||
void SendLogoutPacket();
|
void SendLogoutPacket();
|
||||||
EndPoint GetClientEP();
|
|
||||||
|
|
||||||
// WARNING WARNING WARNING
|
// WARNING WARNING WARNING
|
||||||
//
|
//
|
||||||
|
|
|
@ -11874,11 +11874,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
m_udpClient.SetClientInfo(info);
|
m_udpClient.SetClientInfo(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
public EndPoint GetClientEP()
|
|
||||||
{
|
|
||||||
return m_userEndPoint;
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Media Parcel Members
|
#region Media Parcel Members
|
||||||
|
|
||||||
public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
|
public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
|
||||||
|
|
|
@ -1436,11 +1436,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
||||||
Disconnect();
|
Disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
public EndPoint GetClientEP()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientInfo GetClientInfo()
|
public ClientInfo GetClientInfo()
|
||||||
{
|
{
|
||||||
return new ClientInfo();
|
return new ClientInfo();
|
||||||
|
|
|
@ -895,11 +895,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public EndPoint GetClientEP()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientInfo GetClientInfo()
|
public ClientInfo GetClientInfo()
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -872,13 +872,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
|
if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
|
||||||
{
|
{
|
||||||
ScenePresence target = (ScenePresence)World.Entities[avatarID];
|
ScenePresence target = (ScenePresence)World.Entities[avatarID];
|
||||||
EndPoint ep = target.ControllingClient.GetClientEP();
|
return target.ControllingClient.RemoteEndPoint.Address.ToString();
|
||||||
if (ep is IPEndPoint)
|
|
||||||
{
|
|
||||||
IPEndPoint ip = (IPEndPoint)ep;
|
|
||||||
return ip.Address.ToString();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// fall through case, just return nothing
|
// fall through case, just return nothing
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
|
@ -968,11 +968,6 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public EndPoint GetClientEP()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientInfo GetClientInfo()
|
public ClientInfo GetClientInfo()
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in New Issue