aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-10-02 18:55:09 +0100
committerUbitUmarov2015-10-02 18:55:09 +0100
commitd900d0112dc78850a1406907e0b7ef70cdc91cb5 (patch)
treee32d117a9bd1fbc1fd5524d3f22059628d02b259 /OpenSim
parent also on another location, plus a bit clean (diff)
downloadopensim-SC-d900d0112dc78850a1406907e0b7ef70cdc91cb5.zip
opensim-SC-d900d0112dc78850a1406907e0b7ef70cdc91cb5.tar.gz
opensim-SC-d900d0112dc78850a1406907e0b7ef70cdc91cb5.tar.bz2
opensim-SC-d900d0112dc78850a1406907e0b7ef70cdc91cb5.tar.xz
put back ip check on llSetContentType
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0649a6a..ba41499 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1929,8 +1929,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1929 if (userAgent.IndexOf("SecondLife") < 0) 1929 if (userAgent.IndexOf("SecondLife") < 0)
1930 return; // Not the embedded browser. Is this check good enough? 1930 return; // Not the embedded browser. Is this check good enough?
1931 1931
1932/* script owner alts are not script owners
1933 and diferent persons can show us the same ip
1934 // Use the IP address of the client and check against the request 1932 // Use the IP address of the client and check against the request
1935 // seperate logins from the same IP will allow all of them to get non-text/plain as long 1933 // seperate logins from the same IP will allow all of them to get non-text/plain as long
1936 // as the owner is in the region. Same as SL! 1934 // as the owner is in the region. Same as SL!
@@ -1945,7 +1943,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1945 // If the request isnt from the same IP address then the request cannot be from the owner 1943 // If the request isnt from the same IP address then the request cannot be from the owner
1946 if (!requestFromIPAddress.Trim().Equals(logonFromIPAddress.Trim())) 1944 if (!requestFromIPAddress.Trim().Equals(logonFromIPAddress.Trim()))
1947 return; 1945 return;
1948*/ 1946
1949 switch (type) 1947 switch (type)
1950 { 1948 {
1951 case ScriptBaseClass.CONTENT_TYPE_HTML: 1949 case ScriptBaseClass.CONTENT_TYPE_HTML: