aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorUbitUmarov2014-07-20 14:47:35 +0100
committerUbitUmarov2014-07-20 14:47:35 +0100
commita5fcc0c0c0f41ea3cf490e8061f71a6a2afeca02 (patch)
tree0d3e98ca669d3c87c6a4e80a8e758f7515366bea /OpenSim/Region/ClientStack/Linden
parentphysicsSit SendSitResponse also relative to parent prim (diff)
downloadopensim-SC_OLD-a5fcc0c0c0f41ea3cf490e8061f71a6a2afeca02.zip
opensim-SC_OLD-a5fcc0c0c0f41ea3cf490e8061f71a6a2afeca02.tar.gz
opensim-SC_OLD-a5fcc0c0c0f41ea3cf490e8061f71a6a2afeca02.tar.bz2
opensim-SC_OLD-a5fcc0c0c0f41ea3cf490e8061f71a6a2afeca02.tar.xz
remove avn hack on sitted avatars positions
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs30
1 files changed, 3 insertions, 27 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index b4a0a98..f7338fc 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5132,22 +5132,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5132 5132
5133 position = presence.OffsetPosition; 5133 position = presence.OffsetPosition;
5134 rotation = presence.Rotation; 5134 rotation = presence.Rotation;
5135 5135 angularVelocity = presence.AngularVelocity;
5136 if (presence.ParentID != 0) 5136 rotation = presence.Rotation;
5137 {
5138 SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
5139 if (part != null && part != part.ParentGroup.RootPart)
5140 {
5141 position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
5142 rotation = part.RotationOffset * presence.Rotation;
5143 }
5144 angularVelocity = Vector3.Zero;
5145 }
5146 else
5147 {
5148 angularVelocity = presence.AngularVelocity;
5149 rotation = presence.Rotation;
5150 }
5151 5137
5152 attachPoint = 0; 5138 attachPoint = 0;
5153// m_log.DebugFormat( 5139// m_log.DebugFormat(
@@ -5266,17 +5252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5266 Vector3 offsetPosition = data.OffsetPosition; 5252 Vector3 offsetPosition = data.OffsetPosition;
5267 Quaternion rotation = data.Rotation; 5253 Quaternion rotation = data.Rotation;
5268 uint parentID = data.ParentID; 5254 uint parentID = data.ParentID;
5269 5255
5270 if (parentID != 0)
5271 {
5272 SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
5273 if (part != null && part != part.ParentGroup.RootPart)
5274 {
5275 offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
5276 rotation = part.RotationOffset * data.Rotation;
5277 parentID = part.ParentGroup.RootPart.LocalId;
5278 }
5279 }
5280// m_log.DebugFormat( 5256// m_log.DebugFormat(
5281// "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name); 5257// "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name);
5282 5258