aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie Thielker2014-11-21 04:10:38 +0100
committerMelanie Thielker2014-11-21 04:10:38 +0100
commit3a94e20d701108ae6670a3960eac50db37d88773 (patch)
tree00a11057e80211fee71b34ef25774af05409a6fd /OpenSim/Region/ScriptEngine/Shared
parentRemove braindead "fix" that messed up intersim scripted giving. (diff)
parent fix stopMoveToTarget in attachments case ( similar to core fix) (diff)
downloadopensim-SC_OLD-3a94e20d701108ae6670a3960eac50db37d88773.zip
opensim-SC_OLD-3a94e20d701108ae6670a3960eac50db37d88773.tar.gz
opensim-SC_OLD-3a94e20d701108ae6670a3960eac50db37d88773.tar.bz2
opensim-SC_OLD-3a94e20d701108ae6670a3960eac50db37d88773.tar.xz
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index aaf1170..a5d8292 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3234,6 +3234,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3234 3234
3235 public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) 3235 public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
3236 { 3236 {
3237 doObjectRez(inventory, pos, vel, rot, param, true);
3238 }
3239
3240 public void doObjectRez(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param, bool atRoot)
3241 {
3237 m_host.AddScriptLPS(1); 3242 m_host.AddScriptLPS(1);
3238 3243
3239 Util.FireAndForget(x => 3244 Util.FireAndForget(x =>
@@ -3260,10 +3265,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3260 return; 3265 return;
3261 } 3266 }
3262 3267
3263 // need the magnitude later 3268 List<SceneObjectGroup> new_groups = World.RezObject(m_host, item, pos, rot, vel, param, atRoot);
3264 // float velmag = (float)Util.GetMagnitude(llvel);
3265
3266 List<SceneObjectGroup> new_groups = World.RezObject(m_host, item, pos, rot, vel, param);
3267 3269
3268 // If either of these are null, then there was an unknown error. 3270 // If either of these are null, then there was an unknown error.
3269 if (new_groups == null) 3271 if (new_groups == null)
@@ -3311,7 +3313,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3311 3313
3312 public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) 3314 public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
3313 { 3315 {
3314 llRezAtRoot(inventory, pos, vel, rot, param); 3316 doObjectRez(inventory, pos, vel, rot, param, false);
3315 } 3317 }
3316 3318
3317 public void llLookAt(LSL_Vector target, double strength, double damping) 3319 public void llLookAt(LSL_Vector target, double strength, double damping)