aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs20
2 files changed, 22 insertions, 19 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 57d9966..d220b4a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2133,10 +2133,9 @@ namespace OpenSim.Region.ScriptEngine.Common
2133 Deprecated("llMakeFire"); 2133 Deprecated("llMakeFire");
2134 } 2134 }
2135 2135
2136 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param) 2136 public void llRezAtRoot(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param)
2137 { 2137 {
2138 m_host.AddScriptLPS(1); 2138 m_host.AddScriptLPS(1);
2139 //NotImplemented("llRezObject");
2140 bool found = false; 2139 bool found = false;
2141 2140
2142 // Instead of using return;, I'm using continue; because in our TaskInventory implementation 2141 // Instead of using return;, I'm using continue; because in our TaskInventory implementation
@@ -2191,6 +2190,12 @@ namespace OpenSim.Region.ScriptEngine.Common
2191 llSay(0, "Could not find object " + inventory); 2190 llSay(0, "Could not find object " + inventory);
2192 } 2191 }
2193 2192
2193 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param)
2194 {
2195 // This just calls llRezAtRoot for now.... Lol.
2196 llRezAtRoot( inventory, pos, vel, rot, param );
2197 }
2198
2194 public void llLookAt(LSL_Types.Vector3 target, double strength, double damping) 2199 public void llLookAt(LSL_Types.Vector3 target, double strength, double damping)
2195 { 2200 {
2196 m_host.AddScriptLPS(1); 2201 m_host.AddScriptLPS(1);
@@ -3209,7 +3214,10 @@ namespace OpenSim.Region.ScriptEngine.Common
3209 public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) 3214 public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local)
3210 { 3215 {
3211 m_host.AddScriptLPS(1); 3216 m_host.AddScriptLPS(1);
3212 NotImplemented("llPushObject"); 3217 SceneObjectPart targ = World.GetSceneObjectPart(target);
3218 if( targ == null )
3219 return;
3220 targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0);
3213 } 3221 }
3214 3222
3215 public void llPassCollisions(int pass) 3223 public void llPassCollisions(int pass)
@@ -6459,13 +6467,6 @@ namespace OpenSim.Region.ScriptEngine.Common
6459 return tokens; 6467 return tokens;
6460 } 6468 }
6461 6469
6462 public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity,
6463 LSL_Types.Quaternion rot, int param)
6464 {
6465 m_host.AddScriptLPS(1);
6466 NotImplemented("llRezAtRoot");
6467 }
6468
6469 public LSL_Types.LSLInteger llGetObjectPermMask(int mask) 6470 public LSL_Types.LSLInteger llGetObjectPermMask(int mask)
6470 { 6471 {
6471 m_host.AddScriptLPS(1); 6472 m_host.AddScriptLPS(1);
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
1985 NotImplemented("llMakeFire"); 1985 NotImplemented("llMakeFire");
1986 } 1986 }
1987 1987
1988 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param) 1988 public void llRezAtRoot(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param)
1989 { 1989 {
1990 m_host.AddScriptLPS(1); 1990 m_host.AddScriptLPS(1);
1991 //NotImplemented("llRezObject"); 1991 //NotImplemented("llRezObject");
@@ -2048,6 +2048,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2048 llSay(0, "Could not find object " + inventory); 2048 llSay(0, "Could not find object " + inventory);
2049 } 2049 }
2050 2050
2051 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param)
2052 {
2053 // This just calls llRezAtRoot for now.... Lol.
2054 llRezAtRoot( inventory, pos, vel, rot, param );
2055 }
2056
2051 public void llLookAt(LSL_Types.Vector3 target, double strength, double damping) 2057 public void llLookAt(LSL_Types.Vector3 target, double strength, double damping)
2052 { 2058 {
2053 m_host.AddScriptLPS(1); 2059 m_host.AddScriptLPS(1);
@@ -3150,7 +3156,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3150 public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local) 3156 public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local)
3151 { 3157 {
3152 m_host.AddScriptLPS(1); 3158 m_host.AddScriptLPS(1);
3153 NotImplemented("llPushObject"); 3159 SceneObjectPart targ = World.GetSceneObjectPart(target);
3160 if( targ == null )
3161 return;
3162 targ.ApplyImpulse(new LLVector3((float)impulse.x, (float)impulse.y, (float)impulse.z), local != 0);
3154 } 3163 }
3155 3164
3156 public void llPassCollisions(int pass) 3165 public void llPassCollisions(int pass)
@@ -6236,13 +6245,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6236 return tokens; 6245 return tokens;
6237 } 6246 }
6238 6247
6239 public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity,
6240 LSL_Types.Quaternion rot, int param)
6241 {
6242 m_host.AddScriptLPS(1);
6243 NotImplemented("llRezAtRoot");
6244 }
6245
6246 public LSL_Types.LSLInteger llGetObjectPermMask(int mask) 6248 public LSL_Types.LSLInteger llGetObjectPermMask(int mask)
6247 { 6249 {
6248 m_host.AddScriptLPS(1); 6250 m_host.AddScriptLPS(1);