aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-06-27 01:41:06 +0100
committerUbitUmarov2017-06-27 01:41:06 +0100
commit936aee412d67edc0e143ab13213c5ee1cb1c2a0e (patch)
treebef08b6af3c9b78ccbfa626b6da19b3cddd8a523 /OpenSim/Region
parentdont list deleted ones, that still don't know they are gone (diff)
downloadopensim-SC-936aee412d67edc0e143ab13213c5ee1cb1c2a0e.zip
opensim-SC-936aee412d67edc0e143ab13213c5ee1cb1c2a0e.tar.gz
opensim-SC-936aee412d67edc0e143ab13213c5ee1cb1c2a0e.tar.bz2
opensim-SC-936aee412d67edc0e143ab13213c5ee1cb1c2a0e.tar.xz
remove osGetAgentIP() this was not a good idea to have :(
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs26
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs7
3 files changed, 2 insertions, 32 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index f41f011..a1fd7cd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1080,31 +1080,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1080 targetID, 1080 targetID,
1081 part.SitTargetPosition); 1081 part.SitTargetPosition);
1082 } 1082 }
1083 1083
1084 // Functions that get information from the agent itself.
1085 //
1086 // osGetAgentIP - this is used to determine the IP address of
1087 //the client. This is needed to help configure other in world
1088 //resources based on the IP address of the clients connected.
1089 //I think High is a good risk level for this, as it is an
1090 //information leak.
1091 public string osGetAgentIP(string agent)
1092 {
1093 CheckThreatLevel(ThreatLevel.High, "osGetAgentIP");
1094
1095 UUID avatarID = (UUID)agent;
1096
1097 m_host.AddScriptLPS(1);
1098 if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
1099 {
1100 ScenePresence target = (ScenePresence)World.Entities[avatarID];
1101 return target.ControllingClient.RemoteEndPoint.Address.ToString();
1102 }
1103
1104 // fall through case, just return nothing
1105 return "";
1106 }
1107
1108 // Get a list of all the avatars/agents in the region 1084 // Get a list of all the avatars/agents in the region
1109 public LSL_List osGetAgents() 1085 public LSL_List osGetAgents()
1110 { 1086 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 6e6a0be..6be3c3f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -144,7 +144,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
144 void osSetParcelSIPAddress(string SIPAddress); 144 void osSetParcelSIPAddress(string SIPAddress);
145 145
146 // Avatar Info Commands 146 // Avatar Info Commands
147 string osGetAgentIP(string agent);
148 LSL_List osGetAgents(); 147 LSL_List osGetAgents();
149 148
150 // Teleport commands 149 // Teleport commands
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 43113b8..f5d2a3a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -277,12 +277,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
277 m_OSSL_Functions.osTeleportOwner(position, lookat); 277 m_OSSL_Functions.osTeleportOwner(position, lookat);
278 } 278 }
279 279
280 // Avatar info functions
281 public string osGetAgentIP(string agent)
282 {
283 return m_OSSL_Functions.osGetAgentIP(agent);
284 }
285
286 public LSL_List osGetAgents() 280 public LSL_List osGetAgents()
287 { 281 {
288 return m_OSSL_Functions.osGetAgents(); 282 return m_OSSL_Functions.osGetAgents();
@@ -430,6 +424,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
430 { 424 {
431 return m_OSSL_Functions.osSetPenColor(drawList, color); 425 return m_OSSL_Functions.osSetPenColor(drawList, color);
432 } 426 }
427
433 // Deprecated 428 // Deprecated
434 public string osSetPenColour(string drawList, string colour) 429 public string osSetPenColour(string drawList, string colour)
435 { 430 {