aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
diff options
context:
space:
mode:
authorMelanie2012-07-13 02:27:16 +0100
committerMelanie2012-07-13 02:27:16 +0100
commit64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch)
tree12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
parentMerge branch 'master' into careminster (diff)
parentRemove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff)
downloadopensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip
opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz
opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2
opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs16
1 files changed, 1 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index b449089..17a210b 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
@@ -1440,11 +1440,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1440 Disconnect(); 1440 Disconnect();
1441 } 1441 }
1442 1442
1443 public EndPoint GetClientEP()
1444 {
1445 return null;
1446 }
1447
1448 public ClientInfo GetClientInfo() 1443 public ClientInfo GetClientInfo()
1449 { 1444 {
1450 return new ClientInfo(); 1445 return new ClientInfo();
@@ -1642,15 +1637,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1642 1637
1643 #endregion 1638 #endregion
1644 1639
1645 #region Implementation of IClientIPEndpoint
1646
1647 public IPAddress EndPoint
1648 {
1649 get { return ((IPEndPoint) m_client.Client.RemoteEndPoint).Address; }
1650 }
1651
1652 #endregion
1653
1654 public void SendRebakeAvatarTextures(UUID textureID) 1640 public void SendRebakeAvatarTextures(UUID textureID)
1655 { 1641 {
1656 } 1642 }