From 1121919b57e1495d0357d59e010a865b91757bfb Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Sun, 3 Jan 2010 22:02:36 +0000
Subject: [PATCH] Solve conflict

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index eda3d60f96..a14e3adbbc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2910,13 +2910,6 @@ namespace OpenSim.Region.Framework.Scenes
             SetText(text);
         }
 
-        public void StopLookAt()
-        {
-            m_parentGroup.stopLookAt();
-
-            m_parentGroup.ScheduleGroupForTerseUpdate();        
-        }        
-        
         public void StopMoveToTarget()
         {
             m_parentGroup.stopMoveToTarget();