diff options
author | Justin Clark-Casey (justincc) | 2012-07-12 23:43:02 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-12 23:43:02 +0100 |
commit | dda999a22c5f36d1d413f2f5f29ce8782af85b0b (patch) | |
tree | 368c4981e34b7a5ff24b1ca302487572a7a5e1c6 | |
parent | Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.Re... (diff) | |
download | opensim-SC_OLD-dda999a22c5f36d1d413f2f5f29ce8782af85b0b.zip opensim-SC_OLD-dda999a22c5f36d1d413f2f5f29ce8782af85b0b.tar.gz opensim-SC_OLD-dda999a22c5f36d1d413f2f5f29ce8782af85b0b.tar.bz2 opensim-SC_OLD-dda999a22c5f36d1d413f2f5f29ce8782af85b0b.tar.xz |
Remove IClientIPEndpoint client interface for now.
This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor.
Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 21 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 11 |
2 files changed, 2 insertions, 30 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 0457fe6..bc5315b 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
59 | /// Handles new client connections | 59 | /// Handles new client connections |
60 | /// Constructor takes a single Packet and authenticates everything | 60 | /// Constructor takes a single Packet and authenticates everything |
61 | /// </summary> | 61 | /// </summary> |
62 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IClientIPEndpoint, IStatsCollector | 62 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IStatsCollector |
63 | { | 63 | { |
64 | /// <value> | 64 | /// <value> |
65 | /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. | 65 | /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. |
@@ -450,7 +450,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
450 | RegisterInterface<IClientIM>(this); | 450 | RegisterInterface<IClientIM>(this); |
451 | RegisterInterface<IClientInventory>(this); | 451 | RegisterInterface<IClientInventory>(this); |
452 | RegisterInterface<IClientChat>(this); | 452 | RegisterInterface<IClientChat>(this); |
453 | RegisterInterface<IClientIPEndpoint>(this); | ||
454 | 453 | ||
455 | m_scene = scene; | 454 | m_scene = scene; |
456 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); | 455 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); |
@@ -12114,24 +12113,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12114 | return numPackets; | 12113 | return numPackets; |
12115 | } | 12114 | } |
12116 | 12115 | ||
12117 | #region IClientIPEndpoint Members | ||
12118 | |||
12119 | public IPAddress EndPoint | ||
12120 | { | ||
12121 | get | ||
12122 | { | ||
12123 | if (m_userEndPoint is IPEndPoint) | ||
12124 | { | ||
12125 | IPEndPoint ep = (IPEndPoint)m_userEndPoint; | ||
12126 | |||
12127 | return ep.Address; | ||
12128 | } | ||
12129 | return null; | ||
12130 | } | ||
12131 | } | ||
12132 | |||
12133 | #endregion | ||
12134 | |||
12135 | public void SendRebakeAvatarTextures(UUID textureID) | 12116 | public void SendRebakeAvatarTextures(UUID textureID) |
12136 | { | 12117 | { |
12137 | RebakeAvatarTexturesPacket pack = | 12118 | RebakeAvatarTexturesPacket pack = |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 363a1b8..5043208 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
44 | { | 44 | { |
45 | public delegate void OnIRCClientReadyDelegate(IRCClientView cv); | 45 | public delegate void OnIRCClientReadyDelegate(IRCClientView cv); |
46 | 46 | ||
47 | public class IRCClientView : IClientAPI, IClientCore, IClientIPEndpoint | 47 | public class IRCClientView : IClientAPI, IClientCore |
48 | { | 48 | { |
49 | public event OnIRCClientReadyDelegate OnIRCReady; | 49 | public event OnIRCClientReadyDelegate OnIRCReady; |
50 | 50 | ||
@@ -1628,15 +1628,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1628 | 1628 | ||
1629 | #endregion | 1629 | #endregion |
1630 | 1630 | ||
1631 | #region Implementation of IClientIPEndpoint | ||
1632 | |||
1633 | public IPAddress EndPoint | ||
1634 | { | ||
1635 | get { return ((IPEndPoint) m_client.Client.RemoteEndPoint).Address; } | ||
1636 | } | ||
1637 | |||
1638 | #endregion | ||
1639 | |||
1640 | public void SendRebakeAvatarTextures(UUID textureID) | 1631 | public void SendRebakeAvatarTextures(UUID textureID) |
1641 | { | 1632 | { |
1642 | } | 1633 | } |