diff options
| author | Melanie | 2012-08-31 01:32:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-31 01:32:18 +0100 |
| commit | 1b15144208d925bf1fe6c545616b533faf8945ea (patch) | |
| tree | a7720bb8c2ddcdc1470cf991e26c62b2b1a46be9 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Replace SendBannedUserList with Avination's version. Untested in core. Not ev... (diff) | |
| download | opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.zip opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.gz opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.bz2 opensim-SC-1b15144208d925bf1fe6c545616b533faf8945ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -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 | } |