aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llflexibleobject.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:01 -0500
committerJacek Antonelli2008-08-15 23:45:01 -0500
commit28d8d4e7664bcd6c8369cc18832e42096af7cad2 (patch)
tree069020fe66339aff2ca4176370ff743b14713f2d /linden/indra/newview/llflexibleobject.cpp
parentSecond Life viewer sources 1.17.2.0 (diff)
downloadmeta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.zip
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.gz
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.bz2
meta-impy-28d8d4e7664bcd6c8369cc18832e42096af7cad2.tar.xz
Second Life viewer sources 1.17.3.0
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llflexibleobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 8e4fe91..836cfdc 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -626,7 +626,7 @@ void LLVolumeImplFlexible::onSetScale(const LLVector3& scale, BOOL damped)
626 626
627BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable) 627BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
628{ 628{
629 LLVOVolume *volume = (LLVOVolume*)mVO.get(); 629 LLVOVolume *volume = (LLVOVolume*)mVO;
630 630
631 if (volume->mDrawable.isNull()) // Not sure why this is happening, but it is... 631 if (volume->mDrawable.isNull()) // Not sure why this is happening, but it is...
632 { 632 {
@@ -742,7 +742,7 @@ void LLVolumeImplFlexible::updateRelativeXform()
742{ 742{
743 LLQuaternion delta_rot; 743 LLQuaternion delta_rot;
744 LLVector3 delta_pos, delta_scale; 744 LLVector3 delta_pos, delta_scale;
745 LLVOVolume* vo = (LLVOVolume*) mVO.get(); 745 LLVOVolume* vo = (LLVOVolume*) mVO;
746 746
747 //matrix from local space to parent relative/global space 747 //matrix from local space to parent relative/global space
748 delta_rot = vo->mDrawable->isSpatialRoot() ? LLQuaternion() : vo->mDrawable->getRotation(); 748 delta_rot = vo->mDrawable->isSpatialRoot() ? LLQuaternion() : vo->mDrawable->getRotation();