From 2cee5abcacac3a8f882d0b1245e5da112c18e44b Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Mon, 11 Aug 2008 21:27:31 +0000 Subject: Mantis#1921. Thank you kindly, Leaf for a patch that: llRezObject changed to llRezAtRoot. llRezObject implemented to call llRezAtRoot until I can figure out how to calculate a bounding box. Partial implementation of llPushObject (no angular impulse applied) --- .../Shared/Api/Implementation/LSL_Api.cs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a33c78f..c2fcd1c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -1985,7 +1985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api NotImplemented("llMakeFire"); } - public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param) + public void llRezAtRoot(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param) { m_host.AddScriptLPS(1); //NotImplemented("llRezObject"); @@ -2048,6 +2048,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api llSay(0, "Could not find object " + inventory); } + public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param) + { + // This just calls llRezAtRoot for now.... Lol. + llRezAtRoot( inventory, pos, vel, rot, param ); + } + public void llLookAt(LSL_Types.Vector3 target, double strength, double damping) { m_host.AddScriptLPS(1); @@ -3150,7 +3156,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) { m_host.AddScriptLPS(1); - NotImplemented("llPushObject"); + SceneObjectPart targ = World.GetSceneObjectPart(target); + if( targ == null ) + return; + targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0); } public void llPassCollisions(int pass) @@ -6236,13 +6245,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return tokens; } - public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, - LSL_Types.Quaternion rot, int param) - { - m_host.AddScriptLPS(1); - NotImplemented("llRezAtRoot"); - } - public LSL_Types.LSLInteger llGetObjectPermMask(int mask) { m_host.AddScriptLPS(1); -- cgit v1.1