Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Browse Source 
# Conflicts:
#	indra/llmath/lloctree.h
#	indra/newview/llsurface.cpp
This commit is contained in:
Shyotl
2020-03-15 00:53:20 -05:00
parent 26976b715d e502b87b63
commit a29491658b
353 changed files with 22075 additions and 10251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llvovolume.cpp
View File

@@ -265,6 +265,11 @@ LLVOVolume::~LLVOVolume()
}
}
LLVOVolume* LLVOVolume::asVolume()
{
return this;
}
void LLVOVolume::markDead()
{
if (!mDead)
@@ -3494,8 +3499,6 @@ bool LLVOVolume::isAnimatedObject() const
// virtual
void LLVOVolume::onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent)
{
LLVOVolume *old_volp = dynamic_cast<LLVOVolume*>(old_parent);
if (new_parent && !new_parent->isAvatar())
{
if (mControlAvatar.notNull())
@@ -3507,6 +3510,7 @@ void LLVOVolume::onReparent(LLViewerObject *old_parent, LLViewerObject *new_pare
av->markForDeath();
}
}
LLVOVolume *old_volp = old_parent ? old_parent->asVolume() : nullptr;
if (old_volp && old_volp->isAnimatedObject())
{
if (old_volp->getControlAvatar())
@@ -5245,7 +5249,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
if (bridge)
{
vobj = bridge->mDrawable->getVObj();
vol_obj = dynamic_cast<LLVOVolume*>(vobj);
vol_obj = vobj ? vobj->asVolume() : nullptr;
}
if (vol_obj)
{