From 83929c69e35d156d99be46a6ee50b0d3fe5c9f25 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 6 Mar 2010 00:56:55 -0600
Subject: - implementing server 1.38 functions

Signed-off-by: Melanie <melanie@t-data.com>
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5c283bc..a85a4b3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4680,5 +4680,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.Error("[Physics] " + ex);
             }
         }
+
+        public Color4 GetTextColor()
+        {
+            return new Color4((byte)Color.R, (byte)Color.G, (byte)Color.B, (byte)(0xFF - Color.A));
+        }
     }
 }
-- 
cgit v1.1


From f6f6ef1532517972b973d8a500818dcd50873352 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Thu, 11 Mar 2010 19:12:38 -0500
Subject: Dynamics Integration Part 1

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0d19589..1353518 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -747,7 +747,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary></summary>
         public Vector3 Acceleration
         {
-            get { return m_acceleration; }
+			get 
+			{ 
+                PhysicsActor actor = PhysActor;
+                if (actor != null)
+				{
+					m_acceleration = actor.Acceleration;
+				}
+				return m_acceleration;
+			} 
+            
             set { m_acceleration = value; }
         }
 
-- 
cgit v1.1


From 819806261026cccd68dee649f11938ae5bf10029 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Sun, 14 Mar 2010 16:22:13 -0400
Subject: RotLookAt repaired; debug msg cleanup.

---
 .../Region/Framework/Scenes/SceneObjectGroup.cs    |  4 +--
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 35 ++--------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f35a7c5..5443c28 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1955,7 +1955,7 @@ namespace OpenSim.Region.Framework.Scenes
                 else
                 {
                     if (rootpart.PhysActor != null)
-                    {
+                    {									// APID must be implemented in your physics system for this to function.
                         rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
                         rootpart.PhysActor.APIDStrength = strength;
                         rootpart.PhysActor.APIDDamping = damping;
@@ -1971,7 +1971,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (rootpart != null)
             {
                 if (rootpart.PhysActor != null)
-                {
+                {							// APID must be implemented in your physics system for this to function.
                     rootpart.PhysActor.APIDActive = false;
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 31ea502..548a64f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2705,38 +2705,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         public void RotLookAt(Quaternion target, float strength, float damping)
         {
-            rotLookAt(target, strength, damping);
-        }
-
-        public void rotLookAt(Quaternion target, float strength, float damping)
-        {
-            if (IsAttachment)
-            {
-                /*
-                    ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
-                    if (avatar != null)
-                    {
-                    Rotate the Av?
-                    } */
-            }
-            else
-            {
-                APIDDamp = damping;
-                APIDStrength = strength;
-                APIDTarget = target;
-            }
-        }
-
-        public void startLookAt(Quaternion rot, float damp, float strength)
-        {
-            APIDDamp = damp;
-            APIDStrength = strength;
-            APIDTarget = rot;
-        }
-
-        public void stopLookAt()
-        {
-            APIDTarget = Quaternion.Identity;
+        	m_parentGroup.rotLookAt(target, strength, damping);  // This calls method in SceneObjectGroup.
         }
 
         /// <summary>
@@ -3460,7 +3429,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         public void StopLookAt()
         {
-            m_parentGroup.stopLookAt();
+            m_parentGroup.stopLookAt();    // This calls method in SceneObjectGroup.
 
             m_parentGroup.ScheduleGroupForTerseUpdate();
         }
-- 
cgit v1.1