Merge branch 'careminster' into careminster-presence-refactor

1 files changed, 8 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 093cd0b..62eae76 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2899,10 +2899,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // the angles of rotation in radians into rotation value
 
             LSL_Types.Quaternion rot = llEuler2Rot(angle);
+            /*
             Quaternion rotation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
             m_host.startLookAt(rotation, (float)damping, (float)strength);
+                This would only work if your physics system contains an APID controller */
             // Orient the object to the angle calculated
-            //llSetRot(rot);
+            llSetRot(rot);
         }
         
         public void llRotLookAt(LSL_Rotation target, double strength, double damping)
@@ -4017,14 +4019,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         bucket);
 
                 if (m_TransferModule != null)
-                    m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
+                    m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});

+                
+                //This delay should only occur when giving inventory to avatars.
+                ScriptSleep(3000);
             }
             else
             {
                 // destination is an object
                 World.MoveTaskInventoryItem(destId, m_host, objId);
             }
-            ScriptSleep(3000);
+            
         }
 
         [DebuggerNonUserCode]