diff options
| author | Melanie | 2013-07-18 10:17:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-18 10:17:30 +0100 |
| commit | 437326a4800f23c23abd65b2a44dc21e33f6b1c5 (patch) | |
| tree | 85aee59a2d83ce991064ba663b521d3ef929f1bf /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-437326a4800f23c23abd65b2a44dc21e33f6b1c5.zip opensim-SC-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.gz opensim-SC-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.bz2 opensim-SC-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 2ea265d..d211a2b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -384,7 +384,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 384 | void llSetVehicleRotationParam(int param, LSL_Rotation rot); | 384 | void llSetVehicleRotationParam(int param, LSL_Rotation rot); |
| 385 | void llSetVehicleType(int type); | 385 | void llSetVehicleType(int type); |
| 386 | void llSetVehicleVectorParam(int param, LSL_Vector vec); | 386 | void llSetVehicleVectorParam(int param, LSL_Vector vec); |
| 387 | void llSetVelocity(LSL_Vector velocity, int local); | ||
| 388 | void llShout(int channelID, string text); | 387 | void llShout(int channelID, string text); |
| 389 | LSL_Float llSin(double f); | 388 | LSL_Float llSin(double f); |
| 390 | void llSitTarget(LSL_Vector offset, LSL_Rotation rot); | 389 | void llSitTarget(LSL_Vector offset, LSL_Rotation rot); |