livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for crash on teleport to mesh enabled region. 

Fix for flashing meshes on LOD switch.
meow-7.2.2
Dave Parks 2009-11-05 17:12:18 -06:00
parent ebad60bf1d
commit 1c495c56c1
3 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llprimitive/llprimitive.cpp
View File

@ -744,6 +744,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
return TRUE;
}
#if 0
U32 old_face_mask = mVolumep->mFaceMask;
S32 face_bit = 0;
@ -941,6 +942,9 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
setTE(te_num, *(old_tes.getTexture(face_mapping[face_bit])));
}
}
#else
setNumTEs(mVolumep->getNumFaces());
#endif
return TRUE;
}

47
indra/newview/pipeline.cpp
View File

@ -8902,33 +8902,68 @@ LLCullResult::sg_list_t::iterator LLPipeline::endAlphaGroups()
}
void LLPipeline::loadMesh(LLVOVolume* volume, LLUUID mesh_id)
void LLPipeline::loadMesh(LLVOVolume* vobj, LLUUID mesh_id, S32 detail)
{
{
LLMutexLock lock(mMeshMutex);
//add volume to list of loading meshes
mesh_load_map::iterator iter = mLoadingMeshes.find(mesh_id);
if (iter != mLoadingMeshes.end())
{ //request pending for this mesh, append volume id to list
iter->second.insert(volume->getID());
iter->second.insert(vobj->getID());
return;
}
//first request for this mesh
mLoadingMeshes[mesh_id].insert(volume->getID());
mLoadingMeshes[mesh_id].insert(vobj->getID());
}
if (gAssetStorage->hasLocalAsset(mesh_id, LLAssetType::AT_MESH))
{ //already have asset, load desired LOD in background
mPendingMeshes.push_back(new LLMeshThread(mesh_id, volume->getVolume()));
mPendingMeshes.push_back(new LLMeshThread(mesh_id, vobj->getVolume()));
}
else
{ //fetch asset and load when done
gAssetStorage->getAssetData(mesh_id, LLAssetType::AT_MESH,
getMeshAssetCallback, volume->getVolume(), TRUE);
getMeshAssetCallback, vobj->getVolume(), TRUE);
}
//do a quick search to see if we can't display something while we wait for this mesh to load
LLVolume* volume = vobj->getVolume();
if (volume)
{
LLVolumeParams params = volume->getParams();
LLVolumeLODGroup* group = LLPrimitive::getVolumeManager()->getGroup(params);
if (group)
{
//first see what the next lowest LOD available might be
for (S32 i = detail-1; i >= 0; --i)
{
LLVolume* lod = group->refLOD(i);
if (lod && lod->getNumVolumeFaces() > 0)
{
volume->copyVolumeFaces(lod);
group->derefLOD(lod);
return;
}
}
//no lower LOD is a available, is a higher lod available?
for (S32 i = detail+1; i < 4; ++i)
{
LLVolume* lod = group->refLOD(i);
if (lod && lod->getNumVolumeFaces() > 0)
{
volume->copyVolumeFaces(lod);
group->derefLOD(lod);
return;
}
}
}
}
}
//static

2
indra/newview/pipeline.h
View File

@ -280,7 +280,7 @@ public:
//mesh management functions
void loadMesh(LLVOVolume* volume, LLUUID mesh_id);
void loadMesh(LLVOVolume* volume, LLUUID mesh_id, S32 detail = 0);
void addTrianglesDrawn(S32 count);
BOOL hasRenderType(const U32 type) const { return (type && (mRenderTypeMask & (1<<type))) ? TRUE : FALSE; }