merging in latest mesh-development

1 files changed, 5 insertions, 8 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 373b7f372b..959bce63b1 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -369,6 +369,7 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 		//

 		// Unpack texture entry data

 		//

+

 		S32 result = unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num);

 		if (result & teDirtyBits)

 		{

@@ -974,12 +975,8 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &params_in, const S32 detail, bo
 		// if it's a mesh

 		if ((volume_params.getSculptType() & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)

 		{ //meshes might not have all LODs, get the force detail to best existing LOD

-

 			LLUUID mesh_id = volume_params.getSculptID();

 

-			//profile and path params don't matter for meshes

-			volume_params.setType(LL_PCODE_PROFILE_SQUARE, LL_PCODE_PATH_LINE);

-

 			lod = gMeshRepo.getActualMeshLOD(volume_params, lod);

 			if (lod == -1)

 			{

@@ -1035,14 +1032,13 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &params_in, const S32 detail, bo
 	

 		updateSculptTexture();

 

-

 		if (isSculpted())

 		{

 			updateSculptTexture();

 			// if it's a mesh

 			if ((volume_params.getSculptType() & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)

 			{

-				if (getVolume()->getNumVolumeFaces() == 0 || getVolume()->isTetrahedron())

+				if (!getVolume()->isMeshAssetLoaded())

 				{ 

 					//load request not yet issued, request pipeline load this mesh

 					LLUUID asset_id = volume_params.getSculptID();

@@ -3277,7 +3273,7 @@ U32 LLVOVolume::getHighLODTriangleCount()
 	else if (isMesh())

 	{

 		LLVolume* ref = LLPrimitive::getVolumeManager()->refVolume(volume->getParams(), 3);

-		if (ref->isTetrahedron() || ref->getNumVolumeFaces() == 0)

+		if (!ref->isMeshAssetLoaded() || ref->getNumVolumeFaces() == 0)

 		{

 			gMeshRepo.loadMesh(this, volume->getParams(), LLModel::LOD_HIGH);

 		}

@@ -4119,7 +4115,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 

 		LLVOVolume* vobj = drawablep->getVOVolume();

 

-		if (vobj->getVolume() && vobj->getVolume()->isTetrahedron() || (vobj->isMesh() && !gMeshRepo.meshRezEnabled()))

+		if (vobj->isMesh() &&

+			(vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded() || !gMeshRepo.meshRezEnabled()))

 		{

 			continue;

 		}