From 5334c410ea7552ebc2c758ee8911b3235f76824a Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 19 Apr 2012 14:16:49 -0500
Subject: MAINT-775 Don't thrash vertex buffers on animated prims (flexis,
 spinners, etc).

---
 indra/newview/lldrawable.cpp | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 21b21c152a..3b55ac4a3b 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -182,7 +182,7 @@ LLVOVolume* LLDrawable::getVOVolume() const
 
 const LLMatrix4& LLDrawable::getRenderMatrix() const
 { 
-	return isRoot() ? getWorldMatrix() : getParent()->getWorldMatrix();
+	return isRoot() || isState(LLDrawable::ANIMATED_CHILD) ? getWorldMatrix() : getParent()->getWorldMatrix();
 }
 
 BOOL LLDrawable::isLight() const
@@ -450,7 +450,7 @@ void LLDrawable::makeStatic(BOOL warning_enabled)
 {
 	if (isState(ACTIVE))
 	{
-		clearState(ACTIVE);
+		clearState(ACTIVE | ANIMATED_CHILD);
 
 		if (mParent.notNull() && mParent->isActive() && warning_enabled)
 		{
@@ -542,21 +542,32 @@ F32 LLDrawable::updateXform(BOOL undamped)
 		{
 			// snap to final position
 			dist_squared = 0.0f;
-			if (getVOVolume() && !isRoot())
+			if (getVOVolume() && !isRoot() && !isState(LLDrawable::ANIMATED_CHILD))
 			{ //child prim snapping to some position, needs a rebuild
+				setState(LLDrawable::ANIMATED_CHILD);
 				gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
 			}
 		}
 	}
 
-	if ((mCurrentScale != target_scale) ||
-		(!isRoot() && 
+	LLVector3 vec = mCurrentScale-target_scale;
+	
+	if (vec*vec > MIN_INTERPOLATE_DISTANCE_SQUARED)
+	{ //scale change requires immediate rebuild
+		mCurrentScale = target_scale;
+		gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+	}
+	else if (!isRoot() && 
 		 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED || 
 		 !mVObjp->getAngularVelocity().isExactlyZero() ||
 		 target_pos != mXform.getPosition() ||
-		 target_rot != mXform.getRotation())))
-	{ //child prim moving or scale change requires immediate rebuild
-		gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+		 target_rot != mXform.getRotation()))
+	{ //child prim moving relative to parent, tag as needing to be rendered atomically and rebuild
+		if (!isState(LLDrawable::ANIMATED_CHILD))
+		{
+			setState(LLDrawable::ANIMATED_CHILD);
+			gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+		}
 	}
 	else if (!getVOVolume() && !isAvatar())
 	{
@@ -568,9 +579,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	mXform.setRotation(target_rot);
 	mXform.setScale(LLVector3(1,1,1)); //no scale in drawable transforms (IT'S A RULE!)
 	mXform.updateMatrix();
-	
-	mCurrentScale = target_scale;
-	
+		
 	if (mSpatialBridge)
 	{
 		gPipeline.markMoved(mSpatialBridge, FALSE);
@@ -651,7 +660,6 @@ BOOL LLDrawable::updateMoveUndamped()
 	}
 
 	mVObjp->clearChanged(LLXform::MOVED);
-	
 	return TRUE;
 }
 
@@ -1529,10 +1537,10 @@ BOOL LLDrawable::isAnimating() const
 		return TRUE;
 	}
 
-	if (!isRoot() && !mVObjp->getAngularVelocity().isExactlyZero())
-	{
+	/*if (!isRoot() && !mVObjp->getAngularVelocity().isExactlyZero())
+	{ //target omega
 		return TRUE;
-	}
+	}*/
 
 	return FALSE;
 }
-- 
cgit v1.2.3


From d953cce3868cf53b3f84e1fdd97119c83d3dff7d Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 19 Apr 2012 17:29:32 -0500
Subject: MAINT-775 Cleanup of some weird corner cases on animated child prims.

---
 indra/newview/lldrawable.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 3b55ac4a3b..e06242055c 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -182,7 +182,7 @@ LLVOVolume* LLDrawable::getVOVolume() const
 
 const LLMatrix4& LLDrawable::getRenderMatrix() const
 { 
-	return isRoot() || isState(LLDrawable::ANIMATED_CHILD) ? getWorldMatrix() : getParent()->getWorldMatrix();
+	return isRoot() ? getWorldMatrix() : getParent()->getWorldMatrix();
 }
 
 BOOL LLDrawable::isLight() const
@@ -538,13 +538,12 @@ F32 LLDrawable::updateXform(BOOL undamped)
 			target_rot = new_rot;
 			target_scale = new_scale;
 		}
-		else
+		else if (mVObjp->getAngularVelocity().isExactlyZero())
 		{
-			// snap to final position
+			// snap to final position (only if no target omega is applied)
 			dist_squared = 0.0f;
-			if (getVOVolume() && !isRoot() && !isState(LLDrawable::ANIMATED_CHILD))
+			if (getVOVolume() && !isRoot())
 			{ //child prim snapping to some position, needs a rebuild
-				setState(LLDrawable::ANIMATED_CHILD);
 				gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
 			}
 		}
@@ -558,8 +557,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
 		gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
 	}
 	else if (!isRoot() && 
-		 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED || 
-		 !mVObjp->getAngularVelocity().isExactlyZero() ||
+		 (!mVObjp->getAngularVelocity().isExactlyZero() ||
 		 target_pos != mXform.getPosition() ||
 		 target_rot != mXform.getRotation()))
 	{ //child prim moving relative to parent, tag as needing to be rendered atomically and rebuild
-- 
cgit v1.2.3


From 5ef21ba6c5b0d6c8b5f201c7d2bede983504383c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 20 Apr 2012 00:58:55 -0500
Subject: MAINT-775 More edge case cleanup -- spinning child prims still break
 on deselect until the next LoD update

---
 indra/newview/lldrawable.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index e06242055c..d2cedc7035 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -551,6 +551,8 @@ F32 LLDrawable::updateXform(BOOL undamped)
 
 	LLVector3 vec = mCurrentScale-target_scale;
 	
+	
+
 	if (vec*vec > MIN_INTERPOLATE_DISTANCE_SQUARED)
 	{ //scale change requires immediate rebuild
 		mCurrentScale = target_scale;
@@ -564,7 +566,12 @@ F32 LLDrawable::updateXform(BOOL undamped)
 		if (!isState(LLDrawable::ANIMATED_CHILD))
 		{
 			setState(LLDrawable::ANIMATED_CHILD);
-			gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+			gPipeline.markRebuild(this, LLDrawable::REBUILD_ALL, TRUE);
+			LLSpatialGroup* group = getSpatialGroup();
+			if (group)
+			{
+				gPipeline.markRebuild(group, TRUE);
+			}
 		}
 	}
 	else if (!getVOVolume() && !isAvatar())
@@ -577,7 +584,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	mXform.setRotation(target_rot);
 	mXform.setScale(LLVector3(1,1,1)); //no scale in drawable transforms (IT'S A RULE!)
 	mXform.updateMatrix();
-		
+
 	if (mSpatialBridge)
 	{
 		gPipeline.markMoved(mSpatialBridge, FALSE);
-- 
cgit v1.2.3


From 7a20b5be7844d1f41307d3186b0a9e297efd797a Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 1 May 2012 15:33:16 -0500
Subject: MAINT-775, MAINT-1022 Regression cleanup.

---
 indra/newview/lldrawable.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index d2cedc7035..55fb135898 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -551,8 +551,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
 
 	LLVector3 vec = mCurrentScale-target_scale;
 	
-	
-
 	if (vec*vec > MIN_INTERPOLATE_DISTANCE_SQUARED)
 	{ //scale change requires immediate rebuild
 		mCurrentScale = target_scale;
@@ -560,18 +558,14 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	}
 	else if (!isRoot() && 
 		 (!mVObjp->getAngularVelocity().isExactlyZero() ||
-		 target_pos != mXform.getPosition() ||
-		 target_rot != mXform.getRotation()))
+			dist_squared > 0.f))
 	{ //child prim moving relative to parent, tag as needing to be rendered atomically and rebuild
+		dist_squared = 1.f; //keep this object on the move list
 		if (!isState(LLDrawable::ANIMATED_CHILD))
-		{
+		{			
 			setState(LLDrawable::ANIMATED_CHILD);
 			gPipeline.markRebuild(this, LLDrawable::REBUILD_ALL, TRUE);
-			LLSpatialGroup* group = getSpatialGroup();
-			if (group)
-			{
-				gPipeline.markRebuild(group, TRUE);
-			}
+			mVObjp->dirtySpatialGroup();
 		}
 	}
 	else if (!getVOVolume() && !isAvatar())
-- 
cgit v1.2.3


From 71bbb384b056476bbf1177d20b2ade16ca0a4bcf Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Mon, 7 May 2012 13:24:52 -0700
Subject: MAINT-753 : [crashhunters] crash at LLVOVolume::updateFaceFlags(). 
 Null pointer checks are good. Reviewed by Kelly

---
 indra/newview/lldrawable.cpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 55fb135898..98246162f0 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -604,7 +604,11 @@ void LLDrawable::moveUpdatePipeline(BOOL moved)
 	// Update the face centers.
 	for (S32 i = 0; i < getNumFaces(); i++)
 	{
-		getFace(i)->updateCenterAgent();
+		LLFace* face = getFace(i);
+		if (face)
+		{
+			face->updateCenterAgent();
+		}
 	}
 }
 
@@ -734,7 +738,8 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 				for (S32 i = 0; i < getNumFaces(); i++)
 				{
 					LLFace* facep = getFace(i);
-					if (force_update || facep->getPoolType() == LLDrawPool::POOL_ALPHA)
+					if (facep && 
+						(force_update || facep->getPoolType() == LLDrawPool::POOL_ALPHA))
 					{
 						LLVector4a box;
 						box.setSub(facep->mExtents[1], facep->mExtents[0]);
@@ -833,13 +838,16 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector)
 		for (S32 i = 0; i < getNumFaces(); i++)
 		{
 			LLFace *facep = getFace(i);
-			facep->mCenterAgent += LLVector3(shift_vector.getF32ptr());
-			facep->mExtents[0].add(shift_vector);
-			facep->mExtents[1].add(shift_vector);
-			
-			if (!volume && facep->hasGeometry())
+			if (facep)
 			{
-				facep->clearVertexBuffer();
+				facep->mCenterAgent += LLVector3(shift_vector.getF32ptr());
+				facep->mExtents[0].add(shift_vector);
+				facep->mExtents[1].add(shift_vector);
+			
+				if (!volume && facep->hasGeometry())
+				{
+					facep->clearVertexBuffer();
+				}
 			}
 		}
 		
@@ -961,7 +969,10 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 		for (S32 i = 0; i < getNumFaces(); ++i)
 		{
 			LLFace* facep = getFace(i);
-			facep->clearVertexBuffer();
+			if (facep)
+			{
+				facep->clearVertexBuffer();
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From 92ee373e45b34d5eb7e403480ae1f579b27c4eb6 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 5 Jun 2012 12:55:17 -0500
Subject: MAINT-646 Factor std::set out of lloctree

---
 indra/newview/lldrawable.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 98246162f0..a42f4fcaa1 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -108,6 +108,8 @@ void LLDrawable::init()
 	
 	mGeneration = -1;
 	mBinRadius = 1.f;
+	mBinIndex = -1;
+
 	mSpatialBridge = NULL;
 }
 
@@ -1099,6 +1101,8 @@ LLSpatialBridge::LLSpatialBridge(LLDrawable* root, BOOL render_by_group, U32 dat
 	mDrawable = root;
 	root->setSpatialBridge(this);
 	
+	mBinIndex = -1;
+
 	mRenderType = mDrawable->mRenderType;
 	mDrawableType = mDrawable->mRenderType;
 	
-- 
cgit v1.2.3


From b93a23aa828a2ee6de206fe3c74d1b0f3e116db1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 13 Jun 2012 18:05:56 -0500
Subject: MAINT-1147 Fix for frame stall on region crossing.

---
 indra/newview/lldrawable.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index a42f4fcaa1..4efd2bf4b8 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -57,6 +57,8 @@ const F32 MIN_SHADOW_CASTER_RADIUS = 2.0f;
 
 static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound");
 
+extern bool gShiftFrame;
+
 
 ////////////////////////
 //
@@ -716,6 +718,11 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 		return;
 	}
 
+	if (gShiftFrame)
+	{
+		return;
+	}
+
 	//switch LOD with the spatial group to avoid artifacts
 	//LLSpatialGroup* sg = getSpatialGroup();
 
@@ -825,14 +832,19 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector)
 		mXform.setPosition(mVObjp->getPositionAgent());
 	}
 
-	mXform.setRotation(mVObjp->getRotation());
-	mXform.setScale(1,1,1);
 	mXform.updateMatrix();
 
 	if (isStatic())
 	{
 		LLVOVolume* volume = getVOVolume();
-		if (!volume)
+
+		bool rebuild = (!volume && 
+						getRenderType() != LLPipeline::RENDER_TYPE_TREE &&
+						getRenderType() != LLPipeline::RENDER_TYPE_TERRAIN &&
+						getRenderType() != LLPipeline::RENDER_TYPE_SKY &&
+						getRenderType() != LLPipeline::RENDER_TYPE_GROUND);
+
+		if (rebuild)
 		{
 			gPipeline.markRebuild(this, LLDrawable::REBUILD_ALL, TRUE);
 		}
@@ -846,7 +858,7 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector)
 				facep->mExtents[0].add(shift_vector);
 				facep->mExtents[1].add(shift_vector);
 			
-				if (!volume && facep->hasGeometry())
+				if (rebuild && facep->hasGeometry())
 				{
 					facep->clearVertexBuffer();
 				}
@@ -1406,6 +1418,11 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in, bool force_update)
 		markDead();
 		return;
 	}
+	
+	if (gShiftFrame)
+	{
+		return;
+	}
 
 	if (mDrawable->getVObj())
 	{
-- 
cgit v1.2.3


From 93fcff2b24328560508bec2fbdea81761722eab6 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 14 Jun 2012 14:54:54 -0500
Subject: MAINT-646 Cleanup some warnings from previous changes.

---
 indra/newview/lldrawable.cpp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4efd2bf4b8..563b9b9cab 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -969,6 +969,12 @@ void LLDrawable::updateUVMinMax()
 {
 }
 
+LLSpatialGroup* LLDrawable::getSpatialGroup() const
+{ 
+	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
+	return mSpatialGroupp; 
+}
+
 void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 {
 /*if (mSpatialGroupp && (groupp != mSpatialGroupp))
@@ -991,6 +997,8 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 	}
 
 	mSpatialGroupp = groupp;
+
+	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
 }
 
 LLSpatialPartition* LLDrawable::getSpatialPartition()
@@ -1501,7 +1509,13 @@ void LLSpatialBridge::cleanupReferences()
 	LLDrawable::cleanupReferences();
 	if (mDrawable)
 	{
-		mDrawable->setSpatialGroup(NULL);
+		LLSpatialGroup* group = mDrawable->getSpatialGroup();
+		if (group)
+		{
+			group->mOctreeNode->remove(mDrawable);
+			mDrawable->setSpatialGroup(NULL);
+		}
+		
 		if (mDrawable->getVObj())
 		{
 			LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
@@ -1512,7 +1526,12 @@ void LLSpatialBridge::cleanupReferences()
 				LLDrawable* drawable = child->mDrawable;					
 				if (drawable)
 				{
-					drawable->setSpatialGroup(NULL);
+					LLSpatialGroup* group = drawable->getSpatialGroup();
+					if (group)
+					{
+						group->mOctreeNode->remove(drawable);
+						drawable->setSpatialGroup(NULL);
+					}
 				}
 			}
 		}
-- 
cgit v1.2.3


From 029103133ebac7ee13f1af767f41b012d19a84f5 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 19 Jun 2012 18:08:39 -0500
Subject: MAINT-794 Factor out a lot of CPU overhead around updating objects.

---
 indra/newview/lldrawable.cpp | 47 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 563b9b9cab..c1f82edaaa 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -99,7 +99,6 @@ void LLDrawable::init()
 	mPositionGroup.clear();
 	mExtents[0].clear();
 	mExtents[1].clear();
-	mQuietCount = 0;
 
 	mState     = 0;
 	mVObjp   = NULL;
@@ -407,6 +406,8 @@ void LLDrawable::makeActive()
 		if (!isRoot() && !mParent->isActive())
 		{
 			mParent->makeActive();
+			//NOTE: linked set will now NEVER become static
+			mParent->setState(LLDrawable::ACTIVE_CHILD);
 		}
 
 		//all child objects must also be active
@@ -424,14 +425,6 @@ void LLDrawable::makeActive()
 			}
 		}
 
-		if (mVObjp->getPCode() == LL_PCODE_VOLUME)
-		{
-			if (mVObjp->isFlexible())
-			{
-				return;
-			}
-		}
-	
 		if (mVObjp->getPCode() == LL_PCODE_VOLUME)
 		{
 			gPipeline.markRebuild(this, LLDrawable::REBUILD_VOLUME, TRUE);
@@ -439,28 +432,22 @@ void LLDrawable::makeActive()
 		updatePartition();
 	}
 
-	if (isRoot())
-	{
-		mQuietCount = 0;
-	}
-	else
-	{
-		getParent()->mQuietCount = 0;
-	}
+	llassert(isRoot() || mParent->isActive());
 }
 
 
 void LLDrawable::makeStatic(BOOL warning_enabled)
 {
-	if (isState(ACTIVE))
+	if (isState(ACTIVE) && 
+		!isState(ACTIVE_CHILD) && 
+		!mVObjp->isAttachment() && 
+		!mVObjp->isFlexible())
 	{
 		clearState(ACTIVE | ANIMATED_CHILD);
 
-		if (mParent.notNull() && mParent->isActive() && warning_enabled)
-		{
-			LL_WARNS_ONCE("Drawable") << "Drawable becomes static with active parent!" << LL_ENDL;
-		}
-
+		//drawable became static with active parent, not acceptable
+		llassert(mParent.isNull() || !mParent->isActive() || !warning_enabled);
+		
 		LLViewerObject::const_child_list_t& child_list = mVObjp->getChildren();
 		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
 			 iter != child_list.end(); iter++)
@@ -487,8 +474,8 @@ void LLDrawable::makeStatic(BOOL warning_enabled)
 			mSpatialBridge->markDead();
 			setSpatialBridge(NULL);
 		}
+		updatePartition();
 	}
-	updatePartition();
 }
 
 // Returns "distance" between target destination and resulting xfrom
@@ -792,18 +779,6 @@ void LLDrawable::updateTexture()
 
 	if (getVOVolume())
 	{
-		/*if (isActive())
-		{
-			if (isRoot())
-			{
-				mQuietCount = 0;
-			}
-			else
-			{
-				getParent()->mQuietCount = 0;
-			}
-		}*/
-				
 		gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE);
 	}
 }
-- 
cgit v1.2.3


From fd578f1136301a3b5574e213b39743635f8cff14 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 26 Jun 2012 15:44:02 -0500
Subject: MAINT-654 Potential fix for corrupt avatar bakes on some AMD systems.

---
 indra/newview/lldrawable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index c1f82edaaa..82ea5cd5a6 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -432,7 +432,7 @@ void LLDrawable::makeActive()
 		updatePartition();
 	}
 
-	llassert(isRoot() || mParent->isActive());
+	llassert(isAvatar() || isRoot() || mParent->isActive());
 }
 
 
-- 
cgit v1.2.3


From c0e2d4d988ba6d7d28bfa0487006349266e80709 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 11 Jul 2012 15:14:13 -0500
Subject: MAINT-794 Fix for assert on loading some types of objects before
 their parents.

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

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 82ea5cd5a6..4eda2b92b3 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -625,8 +625,6 @@ BOOL LLDrawable::updateMove()
 		return FALSE;
 	}
 	
-	makeActive();
-	
 	BOOL done;
 
 	if (isState(MOVE_UNDAMPED))
@@ -635,6 +633,7 @@ BOOL LLDrawable::updateMove()
 	}
 	else
 	{
+		makeActive();
 		done = updateMoveDamped();
 	}
 	return done;
-- 
cgit v1.2.3


From ccac47c1a71884c04a00d95358770b170f346fbd Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 16 Jul 2012 14:31:15 -0500
Subject: MAINT-1223 Fix for alpha updates not triggering LoD updates.

---
 indra/newview/lldrawable.cpp | 12 ------------
 1 file changed, 12 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 98246162f0..108ec92f6d 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -783,18 +783,6 @@ void LLDrawable::updateTexture()
 
 	if (getVOVolume())
 	{
-		/*if (isActive())
-		{
-			if (isRoot())
-			{
-				mQuietCount = 0;
-			}
-			else
-			{
-				getParent()->mQuietCount = 0;
-			}
-		}*/
-				
 		gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE);
 	}
 }
-- 
cgit v1.2.3


From 4a5ad357930f0bede4d84b9810978e9d0c5d268b Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 20 Jul 2012 11:42:15 -0500
Subject: MAINT-570 Remove unused memory tracking system LLMemType

---
 indra/newview/lldrawable.cpp | 6 ------
 1 file changed, 6 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4eda2b92b3..46ec1abec1 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -256,8 +256,6 @@ S32 LLDrawable::findReferences(LLDrawable *drawablep)
 
 LLFace*	LLDrawable::addFace(LLFacePool *poolp, LLViewerTexture *texturep)
 {
-	LLMemType mt(LLMemType::MTYPE_DRAWABLE);
-	
 	LLFace *face = new LLFace(this, mVObjp);
 	if (!face) llerrs << "Allocating new Face: " << mFaces.size() << llendl;
 	
@@ -280,8 +278,6 @@ LLFace*	LLDrawable::addFace(LLFacePool *poolp, LLViewerTexture *texturep)
 
 LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep)
 {
-	LLMemType mt(LLMemType::MTYPE_DRAWABLE);
-	
 	LLFace *face;
 	face = new LLFace(this, mVObjp);
 
@@ -763,8 +759,6 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 
 void LLDrawable::updateTexture()
 {
-	LLMemType mt(LLMemType::MTYPE_DRAWABLE);
-	
 	if (isDead())
 	{
 		llwarns << "Dead drawable updating texture!" << llendl;
-- 
cgit v1.2.3


From de1d297deaedaeff212eb2ff13ec4edef21ce633 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 31 Aug 2012 14:11:46 -0500
Subject: MAINT-1503 Disable tcmalloc and fix remaining alignment issues.

---
 indra/newview/lldrawable.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 46ec1abec1..7f6ed3f50e 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -254,9 +254,17 @@ S32 LLDrawable::findReferences(LLDrawable *drawablep)
 	return count;
 }
 
+static LLFastTimer::DeclareTimer FTM_ALLOCATE_FACE("Allocate Face", true);
+
 LLFace*	LLDrawable::addFace(LLFacePool *poolp, LLViewerTexture *texturep)
 {
-	LLFace *face = new LLFace(this, mVObjp);
+	
+	LLFace *face;
+	{
+		LLFastTimer t(FTM_ALLOCATE_FACE);
+		face = new LLFace(this, mVObjp);
+	}
+
 	if (!face) llerrs << "Allocating new Face: " << mFaces.size() << llendl;
 	
 	if (face)
@@ -279,7 +287,11 @@ LLFace*	LLDrawable::addFace(LLFacePool *poolp, LLViewerTexture *texturep)
 LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep)
 {
 	LLFace *face;
-	face = new LLFace(this, mVObjp);
+
+	{
+		LLFastTimer t(FTM_ALLOCATE_FACE);
+		face = new LLFace(this, mVObjp);
+	}
 
 	face->setTEOffset(mFaces.size());
 	face->setTexture(texturep);
-- 
cgit v1.2.3


From a766e26db46c7c054bae1021470dbe365f2a3cb3 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Mon, 10 Sep 2012 10:37:02 -0700
Subject: Backing out the changes contributing to DRTVWR-167 and DRTVWR-179
 from the repository.

---
 indra/newview/lldrawable.cpp | 52 +++++---------------------------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 89a2e9f407..108ec92f6d 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -57,8 +57,6 @@ const F32 MIN_SHADOW_CASTER_RADIUS = 2.0f;
 
 static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound");
 
-extern bool gShiftFrame;
-
 
 ////////////////////////
 //
@@ -110,8 +108,6 @@ void LLDrawable::init()
 	
 	mGeneration = -1;
 	mBinRadius = 1.f;
-	mBinIndex = -1;
-
 	mSpatialBridge = NULL;
 }
 
@@ -718,11 +714,6 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 		return;
 	}
 
-	if (gShiftFrame)
-	{
-		return;
-	}
-
 	//switch LOD with the spatial group to avoid artifacts
 	//LLSpatialGroup* sg = getSpatialGroup();
 
@@ -820,19 +811,14 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector)
 		mXform.setPosition(mVObjp->getPositionAgent());
 	}
 
+	mXform.setRotation(mVObjp->getRotation());
+	mXform.setScale(1,1,1);
 	mXform.updateMatrix();
 
 	if (isStatic())
 	{
 		LLVOVolume* volume = getVOVolume();
-
-		bool rebuild = (!volume && 
-						getRenderType() != LLPipeline::RENDER_TYPE_TREE &&
-						getRenderType() != LLPipeline::RENDER_TYPE_TERRAIN &&
-						getRenderType() != LLPipeline::RENDER_TYPE_SKY &&
-						getRenderType() != LLPipeline::RENDER_TYPE_GROUND);
-
-		if (rebuild)
+		if (!volume)
 		{
 			gPipeline.markRebuild(this, LLDrawable::REBUILD_ALL, TRUE);
 		}
@@ -846,7 +832,7 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector)
 				facep->mExtents[0].add(shift_vector);
 				facep->mExtents[1].add(shift_vector);
 			
-				if (rebuild && facep->hasGeometry())
+				if (!volume && facep->hasGeometry())
 				{
 					facep->clearVertexBuffer();
 				}
@@ -957,12 +943,6 @@ void LLDrawable::updateUVMinMax()
 {
 }
 
-LLSpatialGroup* LLDrawable::getSpatialGroup() const
-{ 
-	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
-	return mSpatialGroupp; 
-}
-
 void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 {
 /*if (mSpatialGroupp && (groupp != mSpatialGroupp))
@@ -985,8 +965,6 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 	}
 
 	mSpatialGroupp = groupp;
-
-	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
 }
 
 LLSpatialPartition* LLDrawable::getSpatialPartition()
@@ -1109,8 +1087,6 @@ LLSpatialBridge::LLSpatialBridge(LLDrawable* root, BOOL render_by_group, U32 dat
 	mDrawable = root;
 	root->setSpatialBridge(this);
 	
-	mBinIndex = -1;
-
 	mRenderType = mDrawable->mRenderType;
 	mDrawableType = mDrawable->mRenderType;
 	
@@ -1414,11 +1390,6 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in, bool force_update)
 		markDead();
 		return;
 	}
-	
-	if (gShiftFrame)
-	{
-		return;
-	}
 
 	if (mDrawable->getVObj())
 	{
@@ -1497,13 +1468,7 @@ void LLSpatialBridge::cleanupReferences()
 	LLDrawable::cleanupReferences();
 	if (mDrawable)
 	{
-		LLSpatialGroup* group = mDrawable->getSpatialGroup();
-		if (group)
-		{
-			group->mOctreeNode->remove(mDrawable);
-			mDrawable->setSpatialGroup(NULL);
-		}
-		
+		mDrawable->setSpatialGroup(NULL);
 		if (mDrawable->getVObj())
 		{
 			LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
@@ -1514,12 +1479,7 @@ void LLSpatialBridge::cleanupReferences()
 				LLDrawable* drawable = child->mDrawable;					
 				if (drawable)
 				{
-					LLSpatialGroup* group = drawable->getSpatialGroup();
-					if (group)
-					{
-						group->mOctreeNode->remove(drawable);
-						drawable->setSpatialGroup(NULL);
-					}
+					drawable->setSpatialGroup(NULL);
 				}
 			}
 		}
-- 
cgit v1.2.3


From 4ddd7968757393657055f61bb51bef7c6e721ebf Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 12 Sep 2012 18:08:45 -0700
Subject: MAINT-1456,MAINT-1519,PATH-879: BUGFIX Correcting behavior for
 objects moved by scripts so that the drawable is properly updated with the
 updated location.

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

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4eda2b92b3..2918d41c2a 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -624,7 +624,9 @@ BOOL LLDrawable::updateMove()
 	{
 		return FALSE;
 	}
-	
+
+	makeActive();
+
 	BOOL done;
 
 	if (isState(MOVE_UNDAMPED))
@@ -633,7 +635,6 @@ BOOL LLDrawable::updateMove()
 	}
 	else
 	{
-		makeActive();
 		done = updateMoveDamped();
 	}
 	return done;
-- 
cgit v1.2.3


From cf98064700a736f73a6c21ce899b186919cbeb64 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 20 Sep 2012 09:48:55 -0400
Subject: reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree

---
 indra/newview/lldrawable.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 108ec92f6d..4435e04b6c 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -108,6 +108,8 @@ void LLDrawable::init()
 	
 	mGeneration = -1;
 	mBinRadius = 1.f;
+	mBinIndex = -1;
+
 	mSpatialBridge = NULL;
 }
 
@@ -1087,6 +1089,8 @@ LLSpatialBridge::LLSpatialBridge(LLDrawable* root, BOOL render_by_group, U32 dat
 	mDrawable = root;
 	root->setSpatialBridge(this);
 	
+	mBinIndex = -1;
+
 	mRenderType = mDrawable->mRenderType;
 	mDrawableType = mDrawable->mRenderType;
 	
-- 
cgit v1.2.3


From 683c43c2e0f6e4d34592528c219f34f638059223 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 20 Sep 2012 10:00:55 -0400
Subject: reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region
 crossing.

---
 indra/newview/lldrawable.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4435e04b6c..25603ccdcf 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -57,6 +57,8 @@ const F32 MIN_SHADOW_CASTER_RADIUS = 2.0f;
 
 static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound");
 
+extern bool gShiftFrame;
+
 
 ////////////////////////
 //
@@ -716,6 +718,11 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 		return;
 	}
 
+	if (gShiftFrame)
+	{
+		return;
+	}
+
 	//switch LOD with the spatial group to avoid artifacts
 	//LLSpatialGroup* sg = getSpatialGroup();
 
@@ -813,14 +820,19 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector)
 		mXform.setPosition(mVObjp->getPositionAgent());
 	}
 
-	mXform.setRotation(mVObjp->getRotation());
-	mXform.setScale(1,1,1);
 	mXform.updateMatrix();
 
 	if (isStatic())
 	{
 		LLVOVolume* volume = getVOVolume();
-		if (!volume)
+
+		bool rebuild = (!volume && 
+						getRenderType() != LLPipeline::RENDER_TYPE_TREE &&
+						getRenderType() != LLPipeline::RENDER_TYPE_TERRAIN &&
+						getRenderType() != LLPipeline::RENDER_TYPE_SKY &&
+						getRenderType() != LLPipeline::RENDER_TYPE_GROUND);
+
+		if (rebuild)
 		{
 			gPipeline.markRebuild(this, LLDrawable::REBUILD_ALL, TRUE);
 		}
@@ -834,7 +846,7 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector)
 				facep->mExtents[0].add(shift_vector);
 				facep->mExtents[1].add(shift_vector);
 			
-				if (!volume && facep->hasGeometry())
+				if (rebuild && facep->hasGeometry())
 				{
 					facep->clearVertexBuffer();
 				}
@@ -1394,6 +1406,11 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in, bool force_update)
 		markDead();
 		return;
 	}
+	
+	if (gShiftFrame)
+	{
+		return;
+	}
 
 	if (mDrawable->getVObj())
 	{
-- 
cgit v1.2.3


From b5e71964e5f2b6cfa792cc30f7f694ee7096c828 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 20 Sep 2012 10:00:56 -0400
Subject: reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous
 changes.

---
 indra/newview/lldrawable.cpp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 25603ccdcf..89a2e9f407 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -957,6 +957,12 @@ void LLDrawable::updateUVMinMax()
 {
 }
 
+LLSpatialGroup* LLDrawable::getSpatialGroup() const
+{ 
+	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
+	return mSpatialGroupp; 
+}
+
 void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 {
 /*if (mSpatialGroupp && (groupp != mSpatialGroupp))
@@ -979,6 +985,8 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 	}
 
 	mSpatialGroupp = groupp;
+
+	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
 }
 
 LLSpatialPartition* LLDrawable::getSpatialPartition()
@@ -1489,7 +1497,13 @@ void LLSpatialBridge::cleanupReferences()
 	LLDrawable::cleanupReferences();
 	if (mDrawable)
 	{
-		mDrawable->setSpatialGroup(NULL);
+		LLSpatialGroup* group = mDrawable->getSpatialGroup();
+		if (group)
+		{
+			group->mOctreeNode->remove(mDrawable);
+			mDrawable->setSpatialGroup(NULL);
+		}
+		
 		if (mDrawable->getVObj())
 		{
 			LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
@@ -1500,7 +1514,12 @@ void LLSpatialBridge::cleanupReferences()
 				LLDrawable* drawable = child->mDrawable;					
 				if (drawable)
 				{
-					drawable->setSpatialGroup(NULL);
+					LLSpatialGroup* group = drawable->getSpatialGroup();
+					if (group)
+					{
+						group->mOctreeNode->remove(drawable);
+						drawable->setSpatialGroup(NULL);
+					}
 				}
 			}
 		}
-- 
cgit v1.2.3


From bc0abc773451d5a71f7f0b024e8d389327425446 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 2 Oct 2012 12:11:42 -0500
Subject: Fix up some assertions in lloctree.h

---
 indra/newview/lldrawable.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 108ec92f6d..0722e66571 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -945,6 +945,12 @@ void LLDrawable::updateUVMinMax()
 
 void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 {
+	//precondition: mSpatialGroupp MUST be null or DEAD or mSpatialGroupp MUST NOT contain this
+	llassert(!mSpatialGroupp || mSpatialGroupp->isDead() || !mSpatialGroupp->hasElement(this));
+
+	//precondition: groupp MUST be null or groupp MUST contain this
+	llassert(!groupp || groupp->hasElement(this));
+
 /*if (mSpatialGroupp && (groupp != mSpatialGroupp))
 	{
 		mSpatialGroupp->setState(LLSpatialGroup::GEOM_DIRTY);
@@ -1468,6 +1474,10 @@ void LLSpatialBridge::cleanupReferences()
 	LLDrawable::cleanupReferences();
 	if (mDrawable)
 	{
+		/*
+		
+		DON'T DO THIS -- this should happen through octree destruction
+
 		mDrawable->setSpatialGroup(NULL);
 		if (mDrawable->getVObj())
 		{
@@ -1482,7 +1492,7 @@ void LLSpatialBridge::cleanupReferences()
 					drawable->setSpatialGroup(NULL);
 				}
 			}
-		}
+		}*/
 
 		LLDrawable* drawablep = mDrawable;
 		mDrawable = NULL;
-- 
cgit v1.2.3


From 830ecff00bd8a4111169ed52bec2384122ff2c01 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 10 Oct 2012 14:13:52 -0500
Subject: DRTVWR-225 Cleanup assertions

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

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 55c780ecba..a0289cd2af 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -990,9 +990,12 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 		}
 	}
 
-	mSpatialGroupp = groupp;
+	//postcondition: if next group is NULL, previous group must be dead OR NULL OR binIndex must be -1
+	//postcondition: if next group is NOT NULL, binIndex must not be -1
+	llassert(groupp == NULL ? (mSpatialGroupp == NULL || mSpatialGroupp->isDead()) || getBinIndex() == -1 :
+							getBinIndex() != -1);
 
-	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
+	mSpatialGroupp = groupp;
 }
 
 LLSpatialPartition* LLDrawable::getSpatialPartition()
-- 
cgit v1.2.3


From c06c35609c6683731eaea283468f6b32af18fea2 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 11 Oct 2012 00:09:04 +0000
Subject: Updating linux build to gcc4.6

---
 indra/newview/lldrawable.cpp | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4eda2b92b3..ded8b20829 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -503,7 +503,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	//scaling
 	LLVector3 target_scale = mVObjp->getScale();
 	LLVector3 old_scale = mCurrentScale;
-	LLVector3 dest_scale = target_scale;
 	
 	// Damping
 	F32 dist_squared = 0.f;
@@ -1215,7 +1214,6 @@ LLCamera LLSpatialBridge::transformCamera(LLCamera& camera)
 	LLCamera ret = camera;
 	LLXformMatrix* mat = mDrawable->getXform();
 	LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix();
-	LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix());
 
 	LLVector3 delta = ret.getOrigin() - center;
 	LLQuaternion rot = ~mat->getRotation();
-- 
cgit v1.2.3


From 9d701e563b90a70794fccc28bdfb8edb5b0abfeb Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Wed, 17 Oct 2012 14:05:14 -0700
Subject: MAINT-1742 Child object does not update position while selected.
 reviewed with Davep

---
 indra/newview/lldrawable.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index cdf6460408..05ae336bc5 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -547,6 +547,10 @@ F32 LLDrawable::updateXform(BOOL undamped)
 			}
 		}
 	}
+	else if (!damped && isVisible())
+	{
+		dist_squared = dist_vec_squared(old_pos, target_pos);
+	}
 
 	LLVector3 vec = mCurrentScale-target_scale;
 	
-- 
cgit v1.2.3


From 0820124beedfc5d220eafc0cb865988f68864c4c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 21 Nov 2012 16:15:35 -0600
Subject: MAINT-1950 Fix for offscreen objects not getting rebuilt sometimes.

---
 indra/newview/lldrawable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 3cfcd88f04..b7270e696e 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -547,7 +547,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
 			}
 		}
 	}
-	else if (!damped && isVisible())
+	else
 	{
 		dist_squared = dist_vec_squared(old_pos, target_pos);
 	}
-- 
cgit v1.2.3


From 7ecfa28c431a3599a99e92775d963241e1b943c0 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Wed, 16 Jan 2013 15:21:11 -0800
Subject: MAINT-2247 Child object does not update rotation while selected.

---
 indra/newview/lldrawable.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index b7270e696e..647c3355ca 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -550,6 +550,8 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	else
 	{
 		dist_squared = dist_vec_squared(old_pos, target_pos);
+		dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f;
+		dist_squared += dist_vec_squared(old_scale, target_scale);
 	}
 
 	LLVector3 vec = mCurrentScale-target_scale;
-- 
cgit v1.2.3


From 27e13e7330ad4c93b0c6e38398588e9a130c5ea9 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 24 Jan 2013 09:17:02 -0800
Subject: MAINT-2275 Child prims are "left behind" by animated, moving
 (physical) linksets

---
 indra/newview/lldrawable.cpp | 59 +++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 647c3355ca..d394ce5b21 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -517,42 +517,45 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	F32 dist_squared = 0.f;
 	F32 camdist2 = (mDistanceWRTCamera * mDistanceWRTCamera);
 
-	if (damped && isVisible())
+	if (isVisible())
 	{
-		F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
-		LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
-		dist_squared = dist_vec_squared(new_pos, target_pos);
+		if (damped)
+		{
+			F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
+			LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
+			dist_squared = dist_vec_squared(new_pos, target_pos);
 
-		LLQuaternion new_rot = nlerp(lerp_amt, old_rot, target_rot);
-		dist_squared += (1.f - dot(new_rot, target_rot)) * 10.f;
+			LLQuaternion new_rot = nlerp(lerp_amt, old_rot, target_rot);
+			dist_squared += (1.f - dot(new_rot, target_rot)) * 10.f;
 
-		LLVector3 new_scale = lerp(old_scale, target_scale, lerp_amt);
-		dist_squared += dist_vec_squared(new_scale, target_scale);
+			LLVector3 new_scale = lerp(old_scale, target_scale, lerp_amt);
+			dist_squared += dist_vec_squared(new_scale, target_scale);
 
-		if ((dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED * camdist2) &&
-			(dist_squared <= MAX_INTERPOLATE_DISTANCE_SQUARED))
-		{
-			// interpolate
-			target_pos = new_pos;
-			target_rot = new_rot;
-			target_scale = new_scale;
+			if ((dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED * camdist2) &&
+				(dist_squared <= MAX_INTERPOLATE_DISTANCE_SQUARED))
+			{
+				// interpolate
+				target_pos = new_pos;
+				target_rot = new_rot;
+				target_scale = new_scale;
+			}
+			else if (mVObjp->getAngularVelocity().isExactlyZero())
+			{
+				// snap to final position (only if no target omega is applied)
+				dist_squared = 0.0f;
+				if (getVOVolume() && !isRoot())
+				{ //child prim snapping to some position, needs a rebuild
+					gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+				}
+			}
 		}
-		else if (mVObjp->getAngularVelocity().isExactlyZero())
+		else
 		{
-			// snap to final position (only if no target omega is applied)
-			dist_squared = 0.0f;
-			if (getVOVolume() && !isRoot())
-			{ //child prim snapping to some position, needs a rebuild
-				gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
-			}
+			dist_squared = dist_vec_squared(old_pos, target_pos);
+			dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f;
+			dist_squared += dist_vec_squared(old_scale, target_scale);
 		}
 	}
-	else
-	{
-		dist_squared = dist_vec_squared(old_pos, target_pos);
-		dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f;
-		dist_squared += dist_vec_squared(old_scale, target_scale);
-	}
 
 	LLVector3 vec = mCurrentScale-target_scale;
 	
-- 
cgit v1.2.3


From aee0766f35d724bfddc4be6b6f0b100467f3b1f4 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 24 Jan 2013 13:21:45 -0800
Subject: MAINT-2275 Child prims are "left behind" by animated, moving
 (physical) linksets * A fix that doesn't break doors. Reverst MAINT-2247

---
 indra/newview/lldrawable.cpp | 62 ++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index d394ce5b21..b15ffec9e3 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -517,45 +517,45 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	F32 dist_squared = 0.f;
 	F32 camdist2 = (mDistanceWRTCamera * mDistanceWRTCamera);
 
-	if (isVisible())
+	if (damped && isVisible())
 	{
-		if (damped)
-		{
-			F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
-			LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
-			dist_squared = dist_vec_squared(new_pos, target_pos);
+		F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
+		LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
+		dist_squared = dist_vec_squared(new_pos, target_pos);
 
-			LLQuaternion new_rot = nlerp(lerp_amt, old_rot, target_rot);
-			dist_squared += (1.f - dot(new_rot, target_rot)) * 10.f;
+		LLQuaternion new_rot = nlerp(lerp_amt, old_rot, target_rot);
+		// FIXME: This can be negative! It is be possible for some rots to 'cancel out' pos or size changes.
+		dist_squared += (1.f - dot(new_rot, target_rot)) * 10.f;
 
-			LLVector3 new_scale = lerp(old_scale, target_scale, lerp_amt);
-			dist_squared += dist_vec_squared(new_scale, target_scale);
+		LLVector3 new_scale = lerp(old_scale, target_scale, lerp_amt);
+		dist_squared += dist_vec_squared(new_scale, target_scale);
 
-			if ((dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED * camdist2) &&
-				(dist_squared <= MAX_INTERPOLATE_DISTANCE_SQUARED))
-			{
-				// interpolate
-				target_pos = new_pos;
-				target_rot = new_rot;
-				target_scale = new_scale;
-			}
-			else if (mVObjp->getAngularVelocity().isExactlyZero())
-			{
-				// snap to final position (only if no target omega is applied)
-				dist_squared = 0.0f;
-				if (getVOVolume() && !isRoot())
-				{ //child prim snapping to some position, needs a rebuild
-					gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
-				}
-			}
+		if ((dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED * camdist2) &&
+			(dist_squared <= MAX_INTERPOLATE_DISTANCE_SQUARED))
+		{
+			// interpolate
+			target_pos = new_pos;
+			target_rot = new_rot;
+			target_scale = new_scale;
 		}
-		else
+		else if (mVObjp->getAngularVelocity().isExactlyZero())
 		{
-			dist_squared = dist_vec_squared(old_pos, target_pos);
-			dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f;
-			dist_squared += dist_vec_squared(old_scale, target_scale);
+			// snap to final position (only if no target omega is applied)
+			dist_squared = 0.0f;
+			if (getVOVolume() && !isRoot())
+			{ //child prim snapping to some position, needs a rebuild
+				gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+			}
 		}
 	}
+	else
+	{
+		dist_squared = dist_vec_squared(old_pos, target_pos);
+
+		// The following "makes sense" and fixes MAINT-2247 but causes MAINT-2275
+		//dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f;
+		//dist_squared += dist_vec_squared(old_scale, target_scale);
+	}
 
 	LLVector3 vec = mCurrentScale-target_scale;
 	
-- 
cgit v1.2.3


From 4d589df2fd9a19cef248987e9f1f71b9be1f9aaa Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 24 Jan 2013 15:32:36 -0800
Subject: MAINT-2275 Child prims are "left behind" by animated, moving
 (physical) linksets * A fix that doesn't break tanks. Reverts MAINT-1742

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

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index b15ffec9e3..d041baea90 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -550,9 +550,10 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	}
 	else
 	{
-		dist_squared = dist_vec_squared(old_pos, target_pos);
+		// The following fixes MAINT-1742 but breaks vehicles similar to MAINT-2275
+		// dist_squared = dist_vec_squared(old_pos, target_pos);
 
-		// The following "makes sense" and fixes MAINT-2247 but causes MAINT-2275
+		// The following fixes MAINT-2247 but causes MAINT-2275
 		//dist_squared += (1.f - dot(old_rot, target_rot)) * 10.f;
 		//dist_squared += dist_vec_squared(old_scale, target_scale);
 	}
-- 
cgit v1.2.3


From 5f03e197f4cfb43de93dc42b16b54beafccd376a Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Fri, 25 Jan 2013 17:54:38 -0500
Subject: Trying to set materials up for rendering! Yay!

---
 indra/newview/lldrawable.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4894d63e13..1ca2344c41 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -300,6 +300,53 @@ LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep)
 
 }
 
+LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep, LLViewerTexture *normalp)
+{
+	LLMemType mt(LLMemType::MTYPE_DRAWABLE);
+	
+	LLFace *face;
+	face = new LLFace(this, mVObjp);
+	
+	face->setTEOffset(mFaces.size());
+	face->setTexture(texturep);
+	face->setNormalMap(normalp);
+	face->setPoolType(gPipeline.getPoolTypeFromTE(te, texturep));
+	
+	mFaces.push_back(face);
+	
+	if (isState(UNLIT))
+	{
+		face->setState(LLFace::FULLBRIGHT);
+	}
+	
+	return face;
+	
+}
+
+LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep, LLViewerTexture *normalp, LLViewerTexture *specularp)
+{
+	LLMemType mt(LLMemType::MTYPE_DRAWABLE);
+	
+	LLFace *face;
+	face = new LLFace(this, mVObjp);
+	
+	face->setTEOffset(mFaces.size());
+	face->setTexture(texturep);
+	face->setNormalMap(normalp);
+	face->setSpecularMap(specularp);
+	face->setPoolType(gPipeline.getPoolTypeFromTE(te, texturep));
+	
+	mFaces.push_back(face);
+	
+	if (isState(UNLIT))
+	{
+		face->setState(LLFace::FULLBRIGHT);
+	}
+	
+	return face;
+	
+}
+
 void LLDrawable::setNumFaces(const S32 newFaces, LLFacePool *poolp, LLViewerTexture *texturep)
 {
 	if (newFaces == (S32)mFaces.size())
-- 
cgit v1.2.3


From 2bcfc9554d8cb4806eb5419a6d3c57b2c61f652c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 12 Feb 2013 14:38:47 -0500
Subject: remove obsolete LLMemType tracing from materials

---
 indra/newview/lldrawable.cpp | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4b61333c4d..525aa65f28 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -310,8 +310,6 @@ LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep)
 
 LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep, LLViewerTexture *normalp)
 {
-	LLMemType mt(LLMemType::MTYPE_DRAWABLE);
-	
 	LLFace *face;
 	face = new LLFace(this, mVObjp);
 	
@@ -333,8 +331,6 @@ LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep,
 
 LLFace*	LLDrawable::addFace(const LLTextureEntry *te, LLViewerTexture *texturep, LLViewerTexture *normalp, LLViewerTexture *specularp)
 {
-	LLMemType mt(LLMemType::MTYPE_DRAWABLE);
-	
 	LLFace *face;
 	face = new LLFace(this, mVObjp);
 	
-- 
cgit v1.2.3


From f352c81f11f26dfe9fe2cf494407045bab41dabf Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Mon, 4 Mar 2013 14:18:49 -0800
Subject: For MAINT-2423 fix regression from CHUI merge. Code review: DaveP

---
 indra/newview/lldrawable.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 59c2f15dd9..ba1759f642 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -643,18 +643,9 @@ BOOL LLDrawable::updateMove()
 		return FALSE;
 	}
 	
-	BOOL done;
+	makeActive();
 
-	if (isState(MOVE_UNDAMPED))
-	{
-		done = updateMoveUndamped();
-	}
-	else
-	{
-		makeActive();
-		done = updateMoveDamped();
-	}
-	return done;
+	return isState(MOVE_UNDAMPED) ? updateMoveUndamped() : updateMoveDamped();
 }
 
 BOOL LLDrawable::updateMoveUndamped()
-- 
cgit v1.2.3


From 2ea750ebcad8335aeb0ec77a483831b62d05f643 Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Tue, 5 Mar 2013 13:47:02 -0800
Subject: For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.

---
 indra/newview/lldrawable.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index ba1759f642..4b0d3b361d 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -577,6 +577,12 @@ F32 LLDrawable::updateXform(BOOL undamped)
 			mVObjp->dirtySpatialGroup();
 		}
 	}
+	else if (!isRoot() &&
+			((dist_vec_squared(old_pos, target_pos) > 0.f)
+			|| (1.f - dot(old_rot, target_rot)) > 0.f))
+	{ //fix for BUG-840, MAINT-2275, MAINT-1742, MAINT-2247
+			gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+	}
 	else if (!getVOVolume() && !isAvatar())
 	{
 		movePartition();
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/lldrawable.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/lldrawable.cpp

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 509c35d5bae7dbd938198c3e038011932693ff36 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 18 Apr 2013 19:21:08 -0500
Subject: NORSPEC-90 Cleanup avatar alpha shaders

---
 indra/newview/lldrawable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index e9895a6e10..fe058cf094 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -484,7 +484,7 @@ void LLDrawable::makeActive()
 	}
 
 	llassert(isAvatar() || isRoot() || mParent->isActive());
-	}
+}
 
 
 void LLDrawable::makeStatic(BOOL warning_enabled)
-- 
cgit v1.2.3


From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 30 Apr 2013 19:50:05 -0700
Subject: Merge 3.5.1 into Materials

---
 indra/newview/lldrawable.cpp | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index fe058cf094..8c9fd4152a 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -554,7 +554,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	//scaling
 	LLVector3 target_scale = mVObjp->getScale();
 	LLVector3 old_scale = mCurrentScale;
-	LLVector3 dest_scale = target_scale;
 	
 	// Damping
 	F32 dist_squared = 0.f;
@@ -1280,7 +1279,6 @@ LLCamera LLSpatialBridge::transformCamera(LLCamera& camera)
 	LLCamera ret = camera;
 	LLXformMatrix* mat = mDrawable->getXform();
 	LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix();
-	LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix());
 
 	LLVector3 delta = ret.getOrigin() - center;
 	LLQuaternion rot = ~mat->getRotation();
-- 
cgit v1.2.3


From 930de04f51212195a2c7a877d235d4106f4d37e2 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 2 Jul 2013 18:02:28 -0500
Subject: NORSPEC-287 Make alpha sRGB correction curves match OpenGL spec.

---
 indra/newview/lldrawable.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 8c9fd4152a..2a333157f2 100755
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -527,6 +527,8 @@ void LLDrawable::makeStatic(BOOL warning_enabled)
 		}
 		updatePartition();
 	}
+
+	llassert(isAvatar() || isRoot() || mParent->isStatic());
 }
 
 // Returns "distance" between target destination and resulting xfrom
-- 
cgit v1.2.3


From d8f700d6ac68388d021e923efa5d89e7d5852bd5 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 28 Aug 2013 09:14:29 -0700
Subject: NORSPEC-355 NORSPEC-356 replaced llerrs with asserts to avoid crashes
 from false alarms in release

---
 indra/newview/lldrawable.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 2a333157f2..9682f38227 100755
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -132,10 +132,16 @@ void LLDrawable::destroy()
 		sNumZombieDrawables--;
 	}
 
+	// Attempt to catch violations of this in debug,
+	// knowing that some false alarms may result
+	//
+	llassert(!LLSpatialGroup::sNoDelete);
+
+	/* cannot be guaranteed and causes crashes on false alarms
 	if (LLSpatialGroup::sNoDelete)
 	{
 		llerrs << "Illegal deletion of LLDrawable!" << llendl;
-	}
+	}*/
 
 	std::for_each(mFaces.begin(), mFaces.end(), DeletePointer());
 	mFaces.clear();
-- 
cgit v1.2.3