diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ffc6f03..413bfc7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1274,8 +1274,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1274 | 1274 | ||
1275 | public void llRegionSayTo(string target, int channel, string msg) | 1275 | public void llRegionSayTo(string target, int channel, string msg) |
1276 | { | 1276 | { |
1277 | string error = String.Empty; | ||
1278 | |||
1279 | if (msg.Length > 1023) | 1277 | if (msg.Length > 1023) |
1280 | msg = msg.Substring(0, 1023); | 1278 | msg = msg.Substring(0, 1023); |
1281 | 1279 | ||
@@ -1911,7 +1909,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1911 | m_host.SetFaceColorAlpha(face, color, null); | 1909 | m_host.SetFaceColorAlpha(face, color, null); |
1912 | } | 1910 | } |
1913 | 1911 | ||
1914 | /* | ||
1915 | public void llSetContentType(LSL_Key id, LSL_Integer type) | 1912 | public void llSetContentType(LSL_Key id, LSL_Integer type) |
1916 | { | 1913 | { |
1917 | m_host.AddScriptLPS(1); | 1914 | m_host.AddScriptLPS(1); |
@@ -1932,6 +1929,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1932 | if (userAgent.IndexOf("SecondLife") < 0) | 1929 | if (userAgent.IndexOf("SecondLife") < 0) |
1933 | return; // Not the embedded browser. Is this check good enough? | 1930 | return; // Not the embedded browser. Is this check good enough? |
1934 | 1931 | ||
1932 | /* script owner alts are not script owners | ||
1933 | and diferent persons can show us the same ip | ||
1935 | // Use the IP address of the client and check against the request | 1934 | // Use the IP address of the client and check against the request |
1936 | // seperate logins from the same IP will allow all of them to get non-text/plain as long | 1935 | // seperate logins from the same IP will allow all of them to get non-text/plain as long |
1937 | // as the owner is in the region. Same as SL! | 1936 | // as the owner is in the region. Same as SL! |
@@ -1946,7 +1945,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1946 | // If the request isnt from the same IP address then the request cannot be from the owner | 1945 | // If the request isnt from the same IP address then the request cannot be from the owner |
1947 | if (!requestFromIPAddress.Trim().Equals(logonFromIPAddress.Trim())) | 1946 | if (!requestFromIPAddress.Trim().Equals(logonFromIPAddress.Trim())) |
1948 | return; | 1947 | return; |
1949 | 1948 | */ | |
1950 | switch (type) | 1949 | switch (type) |
1951 | { | 1950 | { |
1952 | case ScriptBaseClass.CONTENT_TYPE_HTML: | 1951 | case ScriptBaseClass.CONTENT_TYPE_HTML: |
@@ -1978,8 +1977,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1978 | break; | 1977 | break; |
1979 | } | 1978 | } |
1980 | } | 1979 | } |
1981 | */ | ||
1982 | 1980 | ||
1981 | /* | ||
1982 | public void llSetContentType(LSL_Key id, LSL_Integer content_type) | ||
1983 | { | ||
1984 | if (m_UrlModule != null) | ||
1985 | { | ||
1986 | string type = "text.plain"; | ||
1987 | if (content_type == (int)ScriptBaseClass.CONTENT_TYPE_HTML) | ||
1988 | type = "text/html"; | ||
1989 | |||
1990 | m_UrlModule.HttpContentType(new UUID(id),type); | ||
1991 | } | ||
1992 | } | ||
1993 | */ | ||
1983 | public void SetTexGen(SceneObjectPart part, int face,int style) | 1994 | public void SetTexGen(SceneObjectPart part, int face,int style) |
1984 | { | 1995 | { |
1985 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | 1996 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) |
@@ -16094,17 +16105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
16094 | return new LSL_List(); | 16105 | return new LSL_List(); |
16095 | } | 16106 | } |
16096 | 16107 | ||
16097 | public void llSetContentType(LSL_Key id, LSL_Integer content_type) | ||
16098 | { | ||
16099 | if (m_UrlModule != null) | ||
16100 | { | ||
16101 | string type = "text.plain"; | ||
16102 | if (content_type == (int)ScriptBaseClass.CONTENT_TYPE_HTML) | ||
16103 | type = "text/html"; | ||
16104 | 16108 | ||
16105 | m_UrlModule.HttpContentType(new UUID(id),type); | ||
16106 | } | ||
16107 | } | ||
16108 | 16109 | ||
16109 | public void llSetAnimationOverride(LSL_String animState, LSL_String anim) | 16110 | public void llSetAnimationOverride(LSL_String animState, LSL_String anim) |
16110 | { | 16111 | { |