diff options
author | Justin Clark-Casey (justincc) | 2009-09-24 17:35:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-24 17:35:03 +0100 |
commit | ad753d784cfefacd8fb745a1431bf98feac9bbd6 (patch) | |
tree | 795ec1ba25eada570c342746f07654849a7199f4 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | minor: make rest (not comm) modules less noisy if they are disabled (diff) | |
parent | Changed name of the hyperlink XMLRPC method to linkk-region, so that it doesn... (diff) | |
download | opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.zip opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.tar.gz opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.tar.bz2 opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index b631478..4c52b11 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -24,7 +24,7 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
@@ -7838,8 +7838,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7838 | public LSL_String llGetHTTPHeader(LSL_Key request_id, string header) | 7838 | public LSL_String llGetHTTPHeader(LSL_Key request_id, string header) |
7839 | { | 7839 | { |
7840 | m_host.AddScriptLPS(1); | 7840 | m_host.AddScriptLPS(1); |
7841 | 7841 | ||
7842 | if (m_UrlModule != null) | 7842 | if (m_UrlModule != null) |
7843 | return m_UrlModule.GetHttpHeader(new UUID(request_id), header); | 7843 | return m_UrlModule.GetHttpHeader(new UUID(request_id), header); |
7844 | return String.Empty; | 7844 | return String.Empty; |
7845 | } | 7845 | } |
@@ -9124,9 +9124,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9124 | // Partial implementation: support for parameter flags needed | 9124 | // Partial implementation: support for parameter flags needed |
9125 | // see http://wiki.secondlife.com/wiki/llHTTPResponse | 9125 | // see http://wiki.secondlife.com/wiki/llHTTPResponse |
9126 | 9126 | ||
9127 | m_host.AddScriptLPS(1); | 9127 | m_host.AddScriptLPS(1); |
9128 | 9128 | ||
9129 | if (m_UrlModule != null) | 9129 | if (m_UrlModule != null) |
9130 | m_UrlModule.HttpResponse(new UUID(id), status,body); | 9130 | m_UrlModule.HttpResponse(new UUID(id), status,body); |
9131 | } | 9131 | } |
9132 | 9132 | ||