1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426

QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)

1 files changed, 16 insertions, 4 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 37353cf7ec..a1b3c32e01 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1124,30 +1124,36 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 	}
 	else if ((mLODChanged) || (mSculptChanged))
 	{
-		LLPointer<LLVolume> old_volumep, new_volumep;
+		LLVolume *old_volumep, *new_volumep;
 		F32 old_lod, new_lod;
+		S32 old_num_faces, new_num_faces ;
 
 		old_volumep = getVolume();
 		old_lod = old_volumep->getDetail();
+		old_num_faces = old_volumep->getNumFaces() ;
+		old_volumep = NULL ;
 
 		{
 			LLFastTimer ftm(LLFastTimer::FTM_GEN_VOLUME);
 			LLVolumeParams volume_params = getVolume()->getParams();
 			setVolume(volume_params, 0);
 		}
+
 		new_volumep = getVolume();
 		new_lod = new_volumep->getDetail();
+		new_num_faces = new_volumep->getNumFaces() ;
+		new_volumep = NULL ;
 
 		if ((new_lod != old_lod) || mSculptChanged)
 		{
 			compiled = TRUE;
-			sNumLODChanges += getVolume()->getNumFaces();
+			sNumLODChanges += new_num_faces ;
 	
 			drawable->setState(LLDrawable::REBUILD_VOLUME); // for face->genVolumeTriangles()
 
 			{
 				LLFastTimer t(LLFastTimer::FTM_GEN_TRIANGLES);
-				if (new_volumep->getNumFaces() != old_volumep->getNumFaces())
+				if (new_num_faces != old_num_faces)
 				{
 					regenFaces();
 				}
@@ -1225,7 +1231,12 @@ S32 LLVOVolume::setTETexture(const U8 te, const LLUUID &uuid)
 	return res;
 }
 
-S32 LLVOVolume::setTEColor(const U8 te, const LLColor4 &color)
+S32 LLVOVolume::setTEColor(const U8 te, const LLColor3& color)
+{
+	return setTEColor(te, LLColor4(color));
+}
+
+S32 LLVOVolume::setTEColor(const U8 te, const LLColor4& color)
 {
 	S32 res = LLViewerObject::setTEColor(te, color);
 	if (res)
@@ -2458,6 +2469,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 			if (facep->mGeomCount + index_offset > 65535)
 			{ //cut off alpha nodes at 64k vertices
 				facep->mVertexBuffer = NULL ;
+				facep->mLastVertexBuffer = NULL ;
 				continue ;
 			}