diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index daf89e5..d211a2b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -332,7 +332,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
332 | void llSensorRemove(); | 332 | void llSensorRemove(); |
333 | void llSensorRepeat(string name, string id, int type, double range, double arc, double rate); | 333 | void llSensorRepeat(string name, string id, int type, double range, double arc, double rate); |
334 | void llSetAlpha(double alpha, int face); | 334 | void llSetAlpha(double alpha, int face); |
335 | void llSetAngularVelocity(LSL_Vector angvelocity, int local); | ||
336 | void llSetBuoyancy(double buoyancy); | 335 | void llSetBuoyancy(double buoyancy); |
337 | void llSetCameraAtOffset(LSL_Vector offset); | 336 | void llSetCameraAtOffset(LSL_Vector offset); |
338 | void llSetCameraEyeOffset(LSL_Vector offset); | 337 | void llSetCameraEyeOffset(LSL_Vector offset); |
@@ -340,9 +339,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
340 | void llSetCameraParams(LSL_List rules); | 339 | void llSetCameraParams(LSL_List rules); |
341 | void llSetClickAction(int action); | 340 | void llSetClickAction(int action); |
342 | void llSetColor(LSL_Vector color, int face); | 341 | void llSetColor(LSL_Vector color, int face); |
342 | void llSetContentType(LSL_Key id, LSL_Integer type); | ||
343 | void llSetDamage(double damage); | 343 | void llSetDamage(double damage); |
344 | void llSetForce(LSL_Vector force, int local); | 344 | void llSetForce(LSL_Vector force, int local); |
345 | void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local); | 345 | void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local); |
346 | void llSetAngularVelocity(LSL_Vector angularVelocity, int local); | ||
346 | void llSetHoverHeight(double height, int water, double tau); | 347 | void llSetHoverHeight(double height, int water, double tau); |
347 | void llSetInventoryPermMask(string item, int mask, int value); | 348 | void llSetInventoryPermMask(string item, int mask, int value); |
348 | void llSetLinkAlpha(int linknumber, double alpha, int face); | 349 | void llSetLinkAlpha(int linknumber, double alpha, int face); |
@@ -383,7 +384,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
383 | void llSetVehicleRotationParam(int param, LSL_Rotation rot); | 384 | void llSetVehicleRotationParam(int param, LSL_Rotation rot); |
384 | void llSetVehicleType(int type); | 385 | void llSetVehicleType(int type); |
385 | void llSetVehicleVectorParam(int param, LSL_Vector vec); | 386 | void llSetVehicleVectorParam(int param, LSL_Vector vec); |
386 | void llSetVelocity(LSL_Vector velocity, int local); | ||
387 | void llShout(int channelID, string text); | 387 | void llShout(int channelID, string text); |
388 | LSL_Float llSin(double f); | 388 | LSL_Float llSin(double f); |
389 | void llSitTarget(LSL_Vector offset, LSL_Rotation rot); | 389 | void llSitTarget(LSL_Vector offset, LSL_Rotation rot); |
@@ -434,6 +434,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
434 | void llSetKeyframedMotion(LSL_List frames, LSL_List options); | 434 | void llSetKeyframedMotion(LSL_List frames, LSL_List options); |
435 | LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | 435 | LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); |
436 | LSL_List llGetPhysicsMaterial(); | 436 | LSL_List llGetPhysicsMaterial(); |
437 | void llSetContentType(LSL_Key id, LSL_Integer content_type); | ||
438 | } | 437 | } |
439 | } | 438 | } |