Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.

1 files changed, 21 insertions, 6 deletions

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 7d8f7b6df0..746320f887 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -265,7 +265,7 @@ static LLFastTimer::DeclareTimer FTM_BUILD_OCCLUSION("Build Occlusion");
 

 void LLSpatialGroup::buildOcclusion()

 {

-	if (mOcclusionVerts.isNull())

+	//if (mOcclusionVerts.isNull())

 	{

 		mOcclusionVerts = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX, 

 			LLVertexBuffer::sUseStreamDraw ? mBufferUsage : 0); //if GL has a hard time with VBOs, don't use them for occlusion culling.

@@ -727,7 +727,9 @@ void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
 	if (vertex_count > 0 && index_count > 0)

 	{ //create vertex buffer containing volume geometry for this node

 		group->mBuilt = 1.f;

-		if (group->mVertexBuffer.isNull() || (group->mBufferUsage != group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs))

+		if (group->mVertexBuffer.isNull() ||

+			!group->mVertexBuffer->isWriteable() ||

+			(group->mBufferUsage != group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs))

 		{

 			group->mVertexBuffer = createVertexBuffer(mVertexDataMask, group->mBufferUsage);

 			group->mVertexBuffer->allocateBuffer(vertex_count, index_count, true);

@@ -1186,6 +1188,8 @@ void LLSpatialGroup::clearOcclusionState(U32 state, S32 mode)
 

 LLSpatialGroup::LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part) :

 	mState(0),

+	mGeometryBytes(0),

+	mSurfaceArea(0.f),

 	mBuilt(0.f),

 	mOctreeNode(node),

 	mSpatialPartition(part),

@@ -1411,6 +1415,17 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node)
 		}

 	}

 	

+	//clean up avatar attachment stats

+	LLSpatialBridge* bridge = mSpatialPartition->asBridge();

+	if (bridge)

+	{

+		if (bridge->mAvatar.notNull())

+		{

+			bridge->mAvatar->mAttachmentGeometryBytes -= mGeometryBytes;

+			bridge->mAvatar->mAttachmentSurfaceArea -= mSurfaceArea;

+		}

+	}

+

 	clearDrawMap();

 	mVertexBuffer = NULL;

 	mBufferMap.clear();

@@ -1766,7 +1781,7 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera)
 //==============================================

 

 LLSpatialPartition::LLSpatialPartition(U32 data_mask, BOOL render_by_group, U32 buffer_usage)

-: mRenderByGroup(render_by_group)

+: mRenderByGroup(render_by_group), mBridge(NULL)

 {

 	LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);

 	mOcclusionEnabled = TRUE;

@@ -3776,7 +3791,7 @@ void renderRaycast(LLDrawable* drawablep)
 				for (S32 i = 0; i < volume->getNumVolumeFaces(); ++i)

 				{

 					const LLVolumeFace& face = volume->getVolumeFace(i);

-

+					

 					gGL.pushMatrix();

 					gGL.translatef(trans.mV[0], trans.mV[1], trans.mV[2]);					

 					gGL.multMatrix((F32*) vobj->getRelativeXform().mMatrix);

@@ -3810,7 +3825,7 @@ void renderRaycast(LLDrawable* drawablep)
 						gGL.syncMatrices();

 						glDrawElements(GL_TRIANGLES, face.mNumIndices, GL_UNSIGNED_SHORT, face.mIndices);

 					}

-						

+					

 					if (!volume->isUnique())

 					{

 						F32 t = 1.f;

@@ -3822,7 +3837,7 @@ void renderRaycast(LLDrawable* drawablep)
 

 						LLRenderOctreeRaycast render(starta, dir, &t);

 					

-					render.traverse(face.mOctree);

+						render.traverse(face.mOctree);

 					}

 

 					gGL.popMatrix();