From 4cbf8d728e3bc4286463ef0e7cb611b10f594321 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 14 Jan 2012 05:39:56 +0100
Subject: Fix merge

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

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c9a8832..b232855 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2747,11 +2747,6 @@ namespace OpenSim.Region.Framework.Scenes
         
         public void RotLookAt(Quaternion target, float strength, float damping)
         {
-        	m_parentGroup.rotLookAt(target, strength, damping);  // This calls method in SceneObjectGroup.
-        }
-
-        public void rotLookAt(Quaternion target, float strength, float damping)
-        {
             if (ParentGroup.IsAttachment)
             {
                 /*
-- 
cgit v1.1