diff options
| author | Justin Clark-Casey (justincc) | 2012-10-10 01:39:47 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-10 01:39:47 +0100 |
| commit | 756ac4f32104db9dcdfb1c1da81075299e2cbfb4 (patch) | |
| tree | a2005e800b92eace0ee35eb3b4f593ee782c3784 /OpenSim | |
| parent | Remove osDropAttachment threat level check wrongly placed in OSSL_Api.ShoutEr... (diff) | |
| download | opensim-SC_OLD-756ac4f32104db9dcdfb1c1da81075299e2cbfb4.zip opensim-SC_OLD-756ac4f32104db9dcdfb1c1da81075299e2cbfb4.tar.gz opensim-SC_OLD-756ac4f32104db9dcdfb1c1da81075299e2cbfb4.tar.bz2 opensim-SC_OLD-756ac4f32104db9dcdfb1c1da81075299e2cbfb4.tar.xz | |
Correct osSetContentType() threat check to query osSetContentType rather than osSetResponseType
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 279ad59..29bc163 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -3545,10 +3545,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3545 | /// <returns></returns> | 3545 | /// <returns></returns> |
| 3546 | public void osSetContentType(LSL_Key id, string type) | 3546 | public void osSetContentType(LSL_Key id, string type) |
| 3547 | { | 3547 | { |
| 3548 | CheckThreatLevel(ThreatLevel.High,"osSetResponseType"); | 3548 | CheckThreatLevel(ThreatLevel.High, "osSetContentType"); |
| 3549 | |||
| 3549 | if (m_UrlModule != null) | 3550 | if (m_UrlModule != null) |
| 3550 | m_UrlModule.HttpContentType(new UUID(id),type); | 3551 | m_UrlModule.HttpContentType(new UUID(id),type); |
| 3551 | } | 3552 | } |
| 3553 | |||
| 3552 | /// Shout an error if the object owner did not grant the script the specified permissions. | 3554 | /// Shout an error if the object owner did not grant the script the specified permissions. |
| 3553 | /// </summary> | 3555 | /// </summary> |
| 3554 | /// <param name="perms"></param> | 3556 | /// <param name="perms"></param> |