From 473c559478ab56872f0e9d1bea3971b849df0b15 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 30 Aug 2014 01:09:33 +0100
Subject: As per the LL grid, if an avatar is sitting then return it's velocity
 relative to the region rather than relative to its seat.

Resolves http://opensimulator.org/mantis/view.php?id=7175
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f744464..e0b7640 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -622,9 +622,14 @@ namespace OpenSim.Region.Framework.Scenes
 //                        "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
 //                        m_velocity, Name, Scene.RegionInfo.RegionName);
                 }
+                else if (ParentPart != null)
+                {
+                    return ParentPart.ParentGroup.Velocity;
+                }
 
                 return m_velocity;
             }
+
             set
             {
                 if (PhysicsActor != null)
-- 
cgit v1.1