diff options
| author | Justin Clark-Casey (justincc) | 2012-08-29 23:16:16 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-29 23:16:16 +0100 |
| commit | 1f88179a65d3ac82883614f981a081a45c178be9 (patch) | |
| tree | 2a3a0be26a6e440e59cb216ea39d825b263c8982 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Add VectorRenderModuleStressTests that contains a long running test that gene... (diff) | |
| parent | This partially implements the LSL function to set the response (diff) | |
| download | opensim-SC_OLD-1f88179a65d3ac82883614f981a081a45c178be9.zip opensim-SC_OLD-1f88179a65d3ac82883614f981a081a45c178be9.tar.gz opensim-SC_OLD-1f88179a65d3ac82883614f981a081a45c178be9.tar.bz2 opensim-SC_OLD-1f88179a65d3ac82883614f981a081a45c178be9.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index e9131e4..ba1ade2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -955,5 +955,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 955 | { | 955 | { |
| 956 | return m_OSSL_Functions.osGetRezzingObject(); | 956 | return m_OSSL_Functions.osGetRezzingObject(); |
| 957 | } | 957 | } |
| 958 | |||
| 959 | public void osSetContentType(LSL_Key id, string type) | ||
| 960 | { | ||
| 961 | m_OSSL_Functions.osSetContentType(id,type); | ||
| 962 | } | ||
| 958 | } | 963 | } |
| 959 | } | 964 | } |