diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index cb87212672..e9ed066a13 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1734,6 +1734,45 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
+        
+        public void rotLookAt(Quaternion target, float strength, float damping)
+        {
+            SceneObjectPart rootpart = m_rootPart;
+            if (rootpart != null)
+            {
+                if (IsAttachment)
+                {
+                /*
+                    ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
+                    if (avatar != null)
+                    {
+                    Rotate the Av?
+                    } */
+                }
+                else
+                {
+                    if (rootpart.PhysActor != null)
+                    {
+                        rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
+                        rootpart.PhysActor.APIDStrength = strength;
+                        rootpart.PhysActor.APIDDamping = damping;
+                        rootpart.PhysActor.APIDActive = true;
+                    }
+                }
+            }
+        }
+        public void stopLookAt()
+        {
+            SceneObjectPart rootpart = m_rootPart;
+            if (rootpart != null)
+            {
+                if (rootpart.PhysActor != null)
+                {
+                    rootpart.PhysActor.APIDActive = false;
+                }
+            }
+        
+        }
 
         /// <summary>
         /// Uses a PID to attempt to clamp the object on the Z axis at the given height over tau seconds.
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b6916f227d..c0243a5b61 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2185,6 +2185,11 @@ namespace OpenSim.Region.Framework.Scenes
             ParentGroup.HasGroupChanged = true;
             ScheduleFullUpdate();
         }
+        
+        public void RotLookAt(Quaternion target, float strength, float damping)
+        {
+            m_parentGroup.rotLookAt(target, strength, damping);
+        }
 
         /// <summary>
         /// Schedules this prim for a full update
@@ -2668,7 +2673,14 @@ namespace OpenSim.Region.Framework.Scenes
             ParentGroup.HasGroupChanged = true;
             ScheduleFullUpdate();
         }
+        
+        public void StopLookAt()
+        {
+            m_parentGroup.stopLookAt();
 
+            m_parentGroup.ScheduleGroupForTerseUpdate();        
+        }        
+        
         /// <summary>
         /// Set the text displayed for this part.
         /// </summary>
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 8df997eb40..f411dd7a93 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -303,6 +303,26 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
             set { return; }
         }
 
+        public override Quaternion APIDTarget 
+        { 
+        	set { return; }
+        }
+        
+        public override bool APIDActive
+        { 
+        	set { return; }
+        }
+        
+        public override float APIDStrength
+        { 
+        	set { return; }
+        }
+        
+        public override float APIDDamping
+        { 
+        	set { return; }
+        }
+
         public override void SubscribeEvents(int ms)
         {
         }
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index 5ed3b144ac..02328b5918 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -620,6 +620,27 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             set { return; }
         }
 
+
+        public override Quaternion APIDTarget 
+        { 
+        	set { return; }
+        }
+        
+        public override bool APIDActive
+        { 
+        	set { return; }
+        }
+        
+        public override float APIDStrength
+        { 
+        	set { return; }
+        }
+        
+        public override float APIDDamping
+        { 
+        	set { return; }
+        }
+
         /// <summary>
         /// Adds the force supplied to the Target Velocity
         /// The PID controller takes this target velocity and tries to make it a reality
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index 5b542db867..9603ea4571 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -565,7 +565,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
         public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
 
-
+        public override Quaternion APIDTarget { set { return; } }
+        public override bool APIDActive { set { return; } }
+        public override float APIDStrength { set { return; } }
+        public override float APIDDamping { set { return; } }
+        
         public override void AddForce(Vector3 force, bool pushforce)
         {
             m_forcelist.Add(force);
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index 1e94ee2d82..d5d146e11a 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -1238,6 +1238,26 @@ namespace OpenSim.Region.Physics.BulletXPlugin
         public override PIDHoverType PIDHoverType { set { return; } }
         public override float PIDHoverTau { set { return; } }
 
+        public override OpenMetaverse.Quaternion APIDTarget
+        {
+            set { return; }
+        }
+
+        public override bool APIDActive
+        {
+            set { return; }
+        }
+
+        public override float APIDStrength
+        {
+            set { return; }
+        }
+
+        public override float APIDDamping
+        {
+            set { return; }
+        }
+
 
         public override void SubscribeEvents(int ms)
         {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index f58129d241..10b153d25e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -243,7 +243,12 @@ namespace OpenSim.Region.Physics.Manager
         public abstract PIDHoverType PIDHoverType { set;}
         public abstract float PIDHoverTau { set;}
 
-
+		// For RotLookAt        
+        public abstract Quaternion APIDTarget { set;}
+        public abstract bool APIDActive { set;}
+        public abstract float APIDStrength { set;}
+        public abstract float APIDDamping { set;}
+        
         public abstract void AddForce(Vector3 force, bool pushforce);
         public abstract void AddAngularForce(Vector3 force, bool pushforce);
         public abstract void SetMomentum(Vector3 momentum);
@@ -476,7 +481,12 @@ namespace OpenSim.Region.Physics.Manager
         public override bool PIDHoverActive { set { return; } }
         public override PIDHoverType PIDHoverType { set { return; } }
         public override float PIDHoverTau { set { return; } }
-
+        
+        public override Quaternion APIDTarget { set { return; } }
+        public override bool APIDActive { set { return; } }
+        public override float APIDStrength { set { return; } }
+        public override float APIDDamping { set { return; } }
+        
         public override void SetMomentum(Vector3 momentum)
         {
         }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 40fbde1d24..06ed8fb20d 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1196,6 +1196,15 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override bool PIDHoverActive { set { return; } }
         public override PIDHoverType PIDHoverType { set { return; } }
         public override float PIDHoverTau { set { return; } }
+        
+        public override Quaternion APIDTarget{ set { return; } }
+
+        public override bool APIDActive{ set { return; } }
+
+        public override float APIDStrength{ set { return; } }
+
+        public override float APIDDamping{ set { return; } }
+
 
         public override void SubscribeEvents(int ms)
         {
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index d24157473c..3eb3b280e1 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2827,6 +2827,15 @@ Console.WriteLine(" JointCreateFixed");
         public override bool PIDHoverActive { set { m_useHoverPID = value; } }
         public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
         public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
+        
+        public override Quaternion APIDTarget{ set { return; } }
+
+        public override bool APIDActive{ set { return; } }
+
+        public override float APIDStrength{ set { return; } }
+
+        public override float APIDDamping{ set { return; } }
+
 
         private void createAMotor(Vector3 axis)
         {
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index 26cd1dd2c2..566b4e7313 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -304,6 +304,27 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
             set { return; }
         }
+        
+        public override Quaternion APIDTarget
+        {
+            set { return; }
+        }
+
+        public override bool APIDActive
+        {
+            set { return; }
+        }
+
+        public override float APIDStrength
+        {
+            set { return; }
+        }
+
+        public override float APIDDamping
+        {
+            set { return; }
+        }
+
 
         public override void SubscribeEvents(int ms)
         {
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 96c3e2616c..7447f76e1d 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -299,6 +299,27 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
             set { return; }
         }
+        
+        public override Quaternion APIDTarget
+        {
+            set { return; }
+        }
+
+        public override bool APIDActive
+        {
+            set { return; }
+        }
+
+        public override float APIDStrength
+        {
+            set { return; }
+        }
+
+        public override float APIDDamping
+        {
+            set { return; }
+        }
+
 
         public override void SubscribeEvents(int ms)
         {
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 8bdb18d006..24eb6b1d20 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -498,6 +498,28 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         public override bool PIDHoverActive { set { return; } }
         public override PIDHoverType PIDHoverType { set { return; } }
         public override float PIDHoverTau { set { return; } }
+        
+        public override Quaternion APIDTarget
+        {
+            set { return; }
+        }
+
+        public override bool APIDActive
+        {
+            set { return; }
+        }
+
+        public override float APIDStrength
+        {
+            set { return; }
+        }
+
+        public override float APIDDamping
+        {
+            set { return; }
+        }
+
+
 
         public override void SubscribeEvents(int ms)
         {
@@ -780,6 +802,28 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         public override bool PIDHoverActive { set { return; } }
         public override PIDHoverType PIDHoverType { set { return; } }
         public override float PIDHoverTau { set { return; } }
+        
+        public override Quaternion APIDTarget
+        {
+            set { return; }
+        }
+
+        public override bool APIDActive
+        {
+            set { return; }
+        }
+
+        public override float APIDStrength
+        {
+            set { return; }
+        }
+
+        public override float APIDDamping
+        {
+            set { return; }
+        }
+
+        
 
         public override void SubscribeEvents(int ms)
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 79b2391af6..cf3a1a04a8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2724,7 +2724,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llStopLookAt()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llStopLookAt");
+//            NotImplemented("llStopLookAt");
+            m_host.StopLookAt();
         }
 
         public void llSetTimerEvent(double sec)
@@ -3071,7 +3072,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llRotLookAt(LSL_Rotation target, double strength, double damping)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llRotLookAt");
+//            NotImplemented("llRotLookAt");
+            m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
         }
 
         public LSL_Integer llStringLength(string str)