aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-12 23:29:57 +0100
committerJustin Clark-Casey (justincc)2012-07-12 23:29:57 +0100
commit3b3d9967b18335c28ce2dfc269e47bac0ede075a (patch)
tree3be5fb115a9ef5ad9f81422032b15a6dcc9ff7ae /OpenSim
parentChange very recent AllowedViewerList and BannedViewerList config setting name... (diff)
downloadopensim-SC_OLD-3b3d9967b18335c28ce2dfc269e47bac0ede075a.zip
opensim-SC_OLD-3b3d9967b18335c28ce2dfc269e47bac0ede075a.tar.gz
opensim-SC_OLD-3b3d9967b18335c28ce2dfc269e47bac0ede075a.tar.bz2
opensim-SC_OLD-3b3d9967b18335c28ce2dfc269e47bac0ede075a.tar.xz
Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs5
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs8
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
6 files changed, 2 insertions, 27 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4cc2e2c..d5952c4 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1353,7 +1353,6 @@ namespace OpenSim.Framework
1353 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message); 1353 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
1354 1354
1355 void SendLogoutPacket(); 1355 void SendLogoutPacket();
1356 EndPoint GetClientEP();
1357 1356
1358 // WARNING WARNING WARNING 1357 // WARNING WARNING WARNING
1359 // 1358 //
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8874585..0457fe6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11845,11 +11845,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11845 m_udpClient.SetClientInfo(info); 11845 m_udpClient.SetClientInfo(info);
11846 } 11846 }
11847 11847
11848 public EndPoint GetClientEP()
11849 {
11850 return m_userEndPoint;
11851 }
11852
11853 #region Media Parcel Members 11848 #region Media Parcel Members
11854 11849
11855 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) 11850 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 3a32528..363a1b8 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1431,11 +1431,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1431 Disconnect(); 1431 Disconnect();
1432 } 1432 }
1433 1433
1434 public EndPoint GetClientEP()
1435 {
1436 return null;
1437 }
1438
1439 public ClientInfo GetClientInfo() 1434 public ClientInfo GetClientInfo()
1440 { 1435 {
1441 return new ClientInfo(); 1436 return new ClientInfo();
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 9b3400d..67989ba 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -945,11 +945,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
945 { 945 {
946 } 946 }
947 947
948 public EndPoint GetClientEP()
949 {
950 return null;
951 }
952
953 public ClientInfo GetClientInfo() 948 public ClientInfo GetClientInfo()
954 { 949 {
955 return null; 950 return null;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index cfa08c2..3654106 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -874,13 +874,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
874 if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence) 874 if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
875 { 875 {
876 ScenePresence target = (ScenePresence)World.Entities[avatarID]; 876 ScenePresence target = (ScenePresence)World.Entities[avatarID];
877 EndPoint ep = target.ControllingClient.GetClientEP(); 877 return target.ControllingClient.RemoteEndPoint.Address.ToString();
878 if (ep is IPEndPoint)
879 {
880 IPEndPoint ip = (IPEndPoint)ep;
881 return ip.Address.ToString();
882 }
883 } 878 }
879
884 // fall through case, just return nothing 880 // fall through case, just return nothing
885 return ""; 881 return "";
886 } 882 }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 376465c..89c4f11 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -963,11 +963,6 @@ namespace OpenSim.Tests.Common.Mock
963 { 963 {
964 } 964 }
965 965
966 public EndPoint GetClientEP()
967 {
968 return null;
969 }
970
971 public ClientInfo GetClientInfo() 966 public ClientInfo GetClientInfo()
972 { 967 {
973 return null; 968 return null;