aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorTalun2013-06-12 00:06:08 +0100
committerJustin Clark-Casey (justincc)2013-06-15 00:06:03 +0100
commitf074739e3381f85a73dfddcb522c0060edede148 (patch)
tree2019acce336e2b52db760f4e83ad268e1f1d0364 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMantis 6108: ossetprimitiveparams temporary/phantom problem (diff)
downloadopensim-SC_OLD-f074739e3381f85a73dfddcb522c0060edede148.zip
opensim-SC_OLD-f074739e3381f85a73dfddcb522c0060edede148.tar.gz
opensim-SC_OLD-f074739e3381f85a73dfddcb522c0060edede148.tar.bz2
opensim-SC_OLD-f074739e3381f85a73dfddcb522c0060edede148.tar.xz
Mantis 6280: llSetContentType(). An implementation.
An implimentation of llSetContentType including all of the new constants added since the mantis was raised.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs11
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs5
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 559068d..1137ad8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -359,6 +359,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
359 public const int HTTP_CUSTOM_HEADER = 5; 359 public const int HTTP_CUSTOM_HEADER = 5;
360 public const int HTTP_PRAGMA_NO_CACHE = 6; 360 public const int HTTP_PRAGMA_NO_CACHE = 6;
361 361
362 // llSetContentType
363 public const int CONTENT_TYPE_TEXT = 0; //text/plain
364 public const int CONTENT_TYPE_HTML = 1; //text/html
365 public const int CONTENT_TYPE_XML = 2; //application/xml
366 public const int CONTENT_TYPE_XHTML = 3; //application/xhtml+xml
367 public const int CONTENT_TYPE_ATOM = 4; //application/atom+xml
368 public const int CONTENT_TYPE_JSON = 5; //application/json
369 public const int CONTENT_TYPE_LLSD = 6; //application/llsd+xml
370 public const int CONTENT_TYPE_FORM = 7; //application/x-www-form-urlencoded
371 public const int CONTENT_TYPE_RSS = 8; //application/rss+xml
372
362 public const int PRIM_MATERIAL = 2; 373 public const int PRIM_MATERIAL = 2;
363 public const int PRIM_PHYSICS = 3; 374 public const int PRIM_PHYSICS = 3;
364 public const int PRIM_TEMP_ON_REZ = 4; 375 public const int PRIM_TEMP_ON_REZ = 4;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 398c125..87cc342 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1528,6 +1528,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1528 m_LSL_Functions.llSetColor(color, face); 1528 m_LSL_Functions.llSetColor(color, face);
1529 } 1529 }
1530 1530
1531 public void llSetContentType(LSL_Key id, LSL_Integer type)
1532 {
1533 m_LSL_Functions.llSetContentType(id, type);
1534 }
1535
1531 public void llSetDamage(double damage) 1536 public void llSetDamage(double damage)
1532 { 1537 {
1533 m_LSL_Functions.llSetDamage(damage); 1538 m_LSL_Functions.llSetDamage(damage);