From 4733f2c4380991865b4b74f519a3a94a99550661 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 15 Nov 2010 13:22:04 -0500
Subject: Implemented support for getting at the child translational element if
 the SID fails to resolved.

---
 indra/newview/llvovolume.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llvovolume.cpp')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 10b7816caf..3c7c96cc1a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4081,13 +4081,12 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 									//If joint is a pelvis then handle by setting avPos+offset								
 									if ( lookingForJoint == "mPelvis" )
 									{	
-										//Apply av pos + offset 
+										//Apply av pelvis offset
 										if ( !pAvatarVO->hasPelvisOffset() )
 										{										
 											pAvatarVO->setPelvisOffset( true, jointPos );
 											//Trigger to rebuild viewer AV
-											pelvisGotSet = true;
-											//pAvatarVO->setPosition( pAvatarVO->getCharacterPosition() + jointPos );											
+											pelvisGotSet = true;											
 										}										
 									}
 									else
-- 
cgit v1.2.3


From 26b3b37e87da0dae46d5e12a9ab4cae809df22de Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 15 Nov 2010 13:25:59 -0500
Subject: Backed out changeset: 1c9c6cdcccde

---
 indra/newview/llvovolume.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llvovolume.cpp')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3c7c96cc1a..10b7816caf 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4081,12 +4081,13 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 									//If joint is a pelvis then handle by setting avPos+offset								
 									if ( lookingForJoint == "mPelvis" )
 									{	
-										//Apply av pelvis offset
+										//Apply av pos + offset 
 										if ( !pAvatarVO->hasPelvisOffset() )
 										{										
 											pAvatarVO->setPelvisOffset( true, jointPos );
 											//Trigger to rebuild viewer AV
-											pelvisGotSet = true;											
+											pelvisGotSet = true;
+											//pAvatarVO->setPosition( pAvatarVO->getCharacterPosition() + jointPos );											
 										}										
 									}
 									else
-- 
cgit v1.2.3


From f9a35fc4c622cf5b151900dd4590818d965a506b Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 15 Nov 2010 14:02:03 -0500
Subject: Implemented support for getting at the child translational element if
 the SID fails to resolved.

---
 indra/newview/llvovolume.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/llvovolume.cpp')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 10b7816caf..fe11570cf6 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4086,8 +4086,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 										{										
 											pAvatarVO->setPelvisOffset( true, jointPos );
 											//Trigger to rebuild viewer AV
-											pelvisGotSet = true;
-											//pAvatarVO->setPosition( pAvatarVO->getCharacterPosition() + jointPos );											
+											pelvisGotSet = true;											
 										}										
 									}
 									else
-- 
cgit v1.2.3