Crash at LLVOVolume::isAnimatedObject

akleshchev · akleshchev · commit fb1e2a94e1b1 · 2025-06-11T15:52:48.000+03:00
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
@@ -3783,7 +3783,12 @@ bool LLVOVolume::canBeAnimatedObject() const
 
 bool LLVOVolume::isAnimatedObject() const
 {
-    LLVOVolume *root_vol = (LLVOVolume*)getRootEdit();
+    LLViewerObject *root_obj = getRootEdit();
+    if (root_obj->getPCode() != LL_PCODE_VOLUME)
+    {
+        return false; // at the moment only volumes can be animated
+    }
+    LLVOVolume* root_vol = (LLVOVolume*)root_obj;
     mIsAnimatedObject = root_vol->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG;
     return mIsAnimatedObject;
 }

Original file line number	Diff line number	Diff line change
`@@ -3783,7 +3783,12 @@ bool LLVOVolume::canBeAnimatedObject() const`
`3783`	`3783`
`3784`	`3784`	`bool LLVOVolume::isAnimatedObject() const`
`3785`	`3785`	`{`
`3786`		`- LLVOVolume root_vol = (LLVOVolume)getRootEdit();`
	`3786`	`+ LLViewerObject *root_obj = getRootEdit();`
	`3787`	`+ if (root_obj->getPCode() != LL_PCODE_VOLUME)`
	`3788`	`+ {`
	`3789`	`+ return false; // at the moment only volumes can be animated`
	`3790`	`+ }`
	`3791`	`+ LLVOVolume* root_vol = (LLVOVolume*)root_obj;`
`3787`	`3792`	`mIsAnimatedObject = root_vol->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG;`
`3788`	`3793`	`return mIsAnimatedObject;`
`3789`	`3794`	`}`