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/Interface | |
| 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/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index d0e041c..07149b6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -365,5 +365,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 365 | /// </summary> | 365 | /// </summary> |
| 366 | /// <returns>Rezzing object key or NULL_KEY if rezzed by agent or otherwise unknown.</returns> | 366 | /// <returns>Rezzing object key or NULL_KEY if rezzed by agent or otherwise unknown.</returns> |
| 367 | LSL_Key osGetRezzingObject(); | 367 | LSL_Key osGetRezzingObject(); |
| 368 | |||
| 369 | /// <summary> | ||
| 370 | /// Sets the response type for an HTTP request/response | ||
| 371 | /// </summary> | ||
| 372 | /// <returns></returns> | ||
| 373 | void osSetContentType(LSL_Key id, string type); | ||
| 368 | } | 374 | } |
| 369 | } | 375 | } |